Added TODOs, removed unnecessary code