remove more stl/unused code