Prettying up a couple files.

- Removing dead code.
- Fixing indents.