removing offending code