Removed fixed stuff from todo