Remove dual ref to Settings