remove extra merged code