remove dead JDBC code; order functions on arity