InRangeX_Y cleanup!