remove classes
Merge branch 'feature/declassify'