Remove hard coded Field comparison