Actually, deleting Factory is a good idea, since it's probably only used with the code generator that has been removed, or is pointless boilerplate and can be removed.