Remove redundant code following key-entity merge.