Remove redundant feature put back by rebase