Cleaned up the implementation of disabled object collisions