Revert "Unit collision 2"

This reverts commit d206bdaef50439699a0a92cb918a055bfb763fd4.