Further jdbc type cleanup