OAK-1561 small code clean-up