Spring cleaning TODO list