Remove Factory from the API since it is not used any more