Removed some temp code, MaxBinNoShiftAPGens