added cleanup for extra settings, and explicitly 'getting' settings