Revert "Collision integrated with major problems"

This reverts commit 4aabfa702897a331588078e459b8fed4413ee421.