Remove some hacks and fix car entity bug