collision detectino cleanup
mergint collision detection cleanup