[Vault] Remove redeem() and simplify inheritance.
#2737
Merged
redeem() and simplify inheritance.
#2737