Revert "Collision V2"

This reverts commit 9c413084d5b148ba6c05695a6a71528f7f065ee8.