Remove default annotations

These annotations don't need to be present as they are default and the less of them in the source view the better. All references checked and updated in case there was a change of line involved.