Final sweep, cleaning up code

- Fixing some comments
- Removed unused old code