Removing unused factories
Removing component factory interfaces