SymbolFactory clean up