Merge "Remove DB2 support"