Tidy up dependencies and slipstream mincrypt