cleanup and hw2