cleanup and add new setting