update some settings and remove unused