Schema factory cleanup