removed some unused field injection