Removed:
- Removed all the commented out code. General cleanup.