#8 clean up