Clean up colliding checks