(#8) clean up the mess