removed more STL components