remove old file in separate commit?