more refactorings, simplifactions, and removals