removing pickups on map in order

Some issues with picking up current location