Remove unnecessary annotations