Killed off the Settings Resolver and removed some dead code.