Remove Diamond Operators