cleanup of assignment1