Cleanup and TODO list items