more code cleanup:
- remove unused files
- fix indent