Remove cheshire dependency