remove duplicate code introduced during rebase