so remove the MAX and MIN options and simplify the whole lot

Change-Id: Iaaf350c37e01f7fce434af760bcddb9b7d7135ea