JDBC-10 Clean up and api change
Signed-off-by: rpastrana <rodrigo.pastrana@lexisnexis.com>