remove map and vector
/