cleanup for handin