Offending code removed