Cleanup

- Commenting out the code
- remove unnecessary things