Got rid of jdbc stuff