Added todo
Clean up.