hw8 cleanup