Merge "minadbd: remove dead code"