Remove unnecessary annoations