Code cleanup

- Removes some more unnecessary temp files.
- Removes commented code.