hw2 cleanup