Revert "Collision avoidance simple"

This reverts commit 0921a5906eb3ddc5cd2afc94367ec193b53a5b6d.