Cleaned up some collision chaos