Cleans up code

- Removes unused code
- Removes code comments