STY: Remove dead code and whitespace