step5 small cleanup