Cleaning up todo's