clean up settings and templastes

thank you