Remove offending code