Some Cleaning Up

Cleaned up some obsolete code, merged the 2D and 3D bullet-roid
collision check