Remove more unneeded files from templates
fix util scripts to use the existing format