deploy: more cleanups