can finally remove dependency on cl-store
actually removing cl-store