cleanup, add deps to setup