Reorganize settings and remove unused settings