Removed other offending code in project