Remove dead code
Lint fixes