Added some TODO list to cleanup