dead code removal; formatting