MassOnTime - Removed excess classes from templates