Removing unneeded field configuration null checks