removed relics of merge