Settings related cleanup