Remove diamond operators