Remove obsolete collision handler
Rewrite collision handling