major cleanup. Switch to cider