changes to collision_cleanup and vec_store