Make sure registry entry gets removed.