settings cleanup

settings cleanup