Clean up cruft and shift first semester's work