Clean up duplication of database/jdbc from JDBC.