remove unwanted code that is not required at all that came up after the merge