Remove time-wasting vector copy and redundant maps