Optimize collision handling to a single pass and validate collision data early
Cleanup