Agree but code seems not used below so maybe to remove ?