removed offending code