removed more offending code