STEM-6
Remove deprecated classes