remove old classes
Merge pull request #1790 from 810/template-crypsis

remove old classes