Add the HONV, remove generalised LBP