Avoid leaking collision objects that are created at runtime
Remove unncessary conditional compiles