more jdbc type cleanup