Other settings cleanup