Remove diamond operator