#75 cleaned up a bit too much
#80 everything now gets directly despawned