Remove auto generated factories