Merge pull request #1769 from mahagr/feature-crypsis

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

remove old classes