Removing unnecessary annotations