Step 1: remove redundant classes and merge

Step 1: remove redundant classes and merge