Cleanup. TODO updated