Update annotations

[skip ci]
Remove unnecessary with clauses