Scope reduction

Reduce scope of methods in preparation for a round of dead code removal.