Removing domain object factories