Further cleanup of RDBMS connectivity