clean up the offending code