Fixed some issues with entities not being properly removed from machines when picked up or destroyed