Delete dead commented code
Lint some things