Cleaned up TODO list