Improved the way Settlements die and are cleared