More metronome removal, fix default template