Refactor, don't create lockfiles