Unit is properly removed when it dies