removed template heading, cleanup