Removed old unused factories

Change-Id: Ie4003607b2c9ad37ad55f47189403de75bb336c9