Refactor and update-deps on newly cloned deps