pre-beta cleanup part 1