Remove some @s