Clean up in preparation for class