Removed some unused files and moved old TODO list back