removed two deperecated macros causing issues with new clojure jdbc version 0.3.3