Strict errors removed