Cleanup of HW2