Fixing Shopkeeper not being properly removed on trait removal.