removed unused template
fixed up some attributes