fixed namestring issue for annoheaders
removed old template files