Lint fixes and dead code removal.