Cleand up and sone stuff for collision detection