ADEN-1178 remove unreachable code