removed deprecated v0.1 classes