Optimisation: remove debug code, fix the collision detection area