Clean up and TODO's