#7 clean up