Added todo, cleanup.