remove leftovers of old classes