Removed clearing wall since it shouldn't be needed any more, changed cutoffs to be less generous