Removed ObjectFactory references form other methods as advised by JDM