Got rid of some non-existent classes