remove useless commented code
collision problem correction