- removing weird 1.7 classes