Remove the --delete-locks argument everywhere