cleanup and one new setting