Merge "More clean up of oracle/mssql"