deleted some template content & minor things