remove entity from kernel
removing cruft
more cleanup
more device safety