Removed final vestiges of STL