Cleanup and TODO's