Clean up and TODO