compojure1 fix
compojure2 cleanup