#10 clean up