remove deprecated classes