Cleaned up a to-do