WIP: Removing commented code and cleaning up