Merge "rdbms: remove various deprecated methods"