#9 clean up