Cleanup, better cider setup