Clean up todo's