audit templates so that classes do not include 'None'
fix merge conflicts