remove deprecated support classes