Removed unnecessary code/todos