removed dead code that appears after the merge