Clean up code for a new semester