Cleaned up code. Added some TODO
Cleaned up

Added some todos. Removed unused code/comments