more cleanup
new preset to match the templates