Cleanup

- Removed unnecessary variables, functions, and comments