CollisionManager + some clean up