Avoid org.jetbrains annotations

38 files changed, 68 insertions, 187 deletions

diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
index 01992ef4a5b..fcf1fd1a69a 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
@@ -10,7 +10,6 @@ import com.intellij.psi.search.FileTypeIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import ai.vespa.intellij.schema.psi.SdDeclaration;
 import ai.vespa.intellij.schema.psi.SdFile;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,7 +23,7 @@ import java.util.List;
 public class SdChooseByNameContributor implements ChooseByNameContributor {
     
     @Override
-    public String @NotNull [] getNames(Project project, boolean includeNonProjectItems) {
+    public String[] getNames(Project project, boolean includeNonProjectItems) {
         Collection<VirtualFile> virtualFiles = FileTypeIndex.getFiles(SdFileType.INSTANCE, GlobalSearchScope.allScope(project));
         
         List<SdDeclaration> declarations = new ArrayList<>();
@@ -42,7 +41,7 @@ public class SdChooseByNameContributor implements ChooseByNameContributor {
     }
     
     @Override
-    public NavigationItem @NotNull [] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) {
+    public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) {
         Collection<VirtualFile> virtualFiles = FileTypeIndex.getFiles(SdFileType.INSTANCE, GlobalSearchScope.allScope(project));
         
         List<SdDeclaration> declarations = new ArrayList<>();
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
index b02e8371b77..a8e5827f108 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
@@ -8,8 +8,6 @@ import com.intellij.psi.codeStyle.CodeStyleConfigurable;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdCodeStyleSettings.
@@ -23,14 +21,12 @@ public class SdCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
         return new SdCodeStyleSettings(settings);
     }
     
-    @Nullable
     @Override
     public String getConfigurableDisplayName() {
         return "Sd";
     }
     
-    @NotNull
-    public CodeStyleConfigurable createConfigurable(@NotNull CodeStyleSettings settings, @NotNull CodeStyleSettings modelSettings) {
+    public CodeStyleConfigurable createConfigurable(CodeStyleSettings settings, CodeStyleSettings modelSettings) {
         return new CodeStyleAbstractConfigurable(settings, modelSettings, this.getConfigurableDisplayName()) {
             @Override
             protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCommenter.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
index a8872f71b63..bb3de625391 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
@@ -2,7 +2,6 @@
 package ai.vespa.intellij.schema;
 
 import com.intellij.lang.Commenter;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable turning a line into a comment with 
@@ -12,31 +11,26 @@ import org.jetbrains.annotations.Nullable;
  */
 public class SdCommenter implements Commenter {
     
-    @Nullable
     @Override
     public String getLineCommentPrefix() {
         return "#";
     }
     
-    @Nullable
     @Override
     public String getBlockCommentPrefix() {
         return "";
     }
     
-    @Nullable
     @Override
     public String getBlockCommentSuffix() {
         return null;
     }
     
-    @Nullable
     @Override
     public String getCommentedBlockCommentPrefix() {
         return null;
     }
     
-    @Nullable
     @Override
     public String getCommentedBlockCommentSuffix() {
         return null;
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
index 3e5b53c87ea..43feb26bbe4 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
@@ -10,7 +10,6 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.util.ProcessingContext;
 import ai.vespa.intellij.schema.psi.SdTypes;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml) to enables Auto-Complete. Partially works for now.
@@ -24,9 +23,9 @@ public class SdCompletionContributor extends CompletionContributor {
         extend(CompletionType.BASIC, 
                PlatformPatterns.psiElement(SdTypes.IDENTIFIER_VAL),
                new CompletionProvider<>() {
-                   public void addCompletions(@NotNull CompletionParameters parameters, //completion parameters contain details of the cursor position
-                                              @NotNull ProcessingContext context,
-                                              @NotNull CompletionResultSet resultSet) { //result set contains completion details to suggest
+                   public void addCompletions(CompletionParameters parameters, //completion parameters contain details of the cursor position
+                                              ProcessingContext context,
+                                              CompletionResultSet resultSet) { //result set contains completion details to suggest
                        resultSet.addElement(LookupElementBuilder.create(""));
                    }
                }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
index b469d0c0ebb..f2b38a61844 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdFileType.java
@@ -2,8 +2,6 @@
 package ai.vespa.intellij.schema;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
 
@@ -20,25 +18,21 @@ public class SdFileType extends LanguageFileType {
         super(SdLanguage.INSTANCE);
     }
     
-    @NotNull
     @Override
     public String getName() {
         return "Sd File";
     }
     
-    @NotNull
     @Override
     public String getDescription() {
         return "Sd language file";
     }
     
-    @NotNull
     @Override
     public String getDefaultExtension() {
         return "sd";
     }
     
-    @Nullable
     @Override
     public Icon getIcon() {
         return SdIcons.FILE;
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
index 5f618a62d6e..afc7f4b946e 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
@@ -4,7 +4,6 @@ package ai.vespa.intellij.schema;
 import com.intellij.lang.Language;
 import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable;
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml), to make the IDE use our plugin's code for coding style.
@@ -13,14 +12,13 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SdLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
     
-    @NotNull
     @Override
     public Language getLanguage() {
         return SdLanguage.INSTANCE;
     }
     
     @Override
-    public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @NotNull SettingsType settingsType) {
+    public void customizeSettings(CodeStyleSettingsCustomizable consumer, SettingsType settingsType) {
         if (settingsType == SettingsType.SPACING_SETTINGS) {
             consumer.showStandardOptions("SPACE_AFTER_COLON");
 //            consumer.renameStandardOption("SPACE_AROUND_ASSIGNMENT_OPERATORS", "Separator");
@@ -32,7 +30,7 @@ public class SdLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettin
     }
     
     @Override
-    public String getCodeSample(@NotNull SettingsType settingsType) {
+    public String getCodeSample(SettingsType settingsType) {
         return "field myField type int {\n    indexing: summary\n}";
     }
     
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
index 24de7bb6253..88dbf6ce0ff 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
@@ -4,8 +4,6 @@ package ai.vespa.intellij.schema;
 import com.intellij.lang.refactoring.RefactoringSupportProvider;
 import com.intellij.psi.PsiElement;
 import ai.vespa.intellij.schema.psi.SdIdentifier;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable refactoring.
@@ -15,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 public class SdRefactoringSupportProvider extends RefactoringSupportProvider {
 
     @Override
-    public boolean isMemberInplaceRenameAvailable(@NotNull PsiElement elementToRename, @Nullable PsiElement context) {
+    public boolean isMemberInplaceRenameAvailable(PsiElement elementToRename, PsiElement context) {
         return (elementToRename instanceof SdIdentifier);
     }
 
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdReference.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdReference.java
index 6404a738e59..8218d8cc81b 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdReference.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdReference.java
@@ -12,8 +12,6 @@ import com.intellij.psi.PsiReferenceBase;
 import com.intellij.psi.ResolveResult;
 import com.intellij.util.IncorrectOperationException;
 import ai.vespa.intellij.schema.psi.SdDeclaration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,14 +25,13 @@ public class SdReference extends PsiReferenceBase<PsiElement> implements PsiPoly
     
     private final String elementName;
     
-    public SdReference(@NotNull PsiElement element, TextRange textRange) {
+    public SdReference(PsiElement element, TextRange textRange) {
         super(element, textRange);
         elementName = element.getText().substring(textRange.getStartOffset(), textRange.getEndOffset());
     }
     
-    @NotNull
     @Override
-    public ResolveResult @NotNull [] multiResolve(boolean incompleteCode) {
+    public ResolveResult[] multiResolve(boolean incompleteCode) {
         
         PsiElement file = myElement.getContainingFile();
         
@@ -48,7 +45,6 @@ public class SdReference extends PsiReferenceBase<PsiElement> implements PsiPoly
         return results.toArray(new ResolveResult[results.size()]);
     }
     
-    @Nullable
     @Override
     public PsiElement resolve() {
         ResolveResult[] resolveResults = multiResolve(false);
@@ -56,7 +52,7 @@ public class SdReference extends PsiReferenceBase<PsiElement> implements PsiPoly
     }
     
     @Override
-    public Object @NotNull [] getVariants() {
+    public Object[] getVariants() {
         List<SdDeclaration> declarations = SdUtil.findDeclarations(myElement.getContainingFile());
         List<LookupElement> variants = new ArrayList<>();
         for (final SdDeclaration element : declarations) {
@@ -71,7 +67,7 @@ public class SdReference extends PsiReferenceBase<PsiElement> implements PsiPoly
     }
     
     @Override
-    public PsiElement handleElementRename(@NotNull String newElementName) throws IncorrectOperationException {
+    public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
         return ((PsiNamedElement) myElement).setName(newElementName);
     }
     
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
index df3da81e9fc..666687e56c1 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
@@ -12,7 +12,6 @@ import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import ai.vespa.intellij.schema.lexer.SdLexerAdapter;
 import ai.vespa.intellij.schema.psi.SdTypes;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 
@@ -54,14 +53,13 @@ public class SdSyntaxHighlighter extends SyntaxHighlighterBase {
     private static final TextAttributesKey[] COMMENT_KEYS = new TextAttributesKey[]{COMMENT};
     private static final TextAttributesKey[] EMPTY_KEYS = new TextAttributesKey[0];
     
-    @NotNull
     @Override
     public Lexer getHighlightingLexer() {
         return new SdLexerAdapter();
     }
     
     @Override
-    public TextAttributesKey @NotNull [] getTokenHighlights(IElementType tokenType) {
+    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
         if (tokenType.equals(SdTypes.IDENTIFIER_VAL) || tokenType.equals(SdTypes.IDENTIFIER_WITH_DASH_VAL)) {
             return IDENTIFIER_KEYS;
         } else if (keyWordsSet.contains(tokenType)) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
index 6cf30ecb54e..9101c85c55d 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
@@ -5,7 +5,6 @@ import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdSyntaxHighlighter.
@@ -14,7 +13,6 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SdSyntaxHighlighterFactory extends SyntaxHighlighterFactory {
     
-    @NotNull
     @Override
     public SyntaxHighlighter getSyntaxHighlighter(Project project, VirtualFile virtualFile) {
         return new SdSyntaxHighlighter();
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
index f3f949d645f..d9f769d07cc 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/SdUtil.java
@@ -30,7 +30,6 @@ import ai.vespa.intellij.schema.psi.SdSchemaAnnotationDefinition;
 import ai.vespa.intellij.schema.psi.SdSchemaFieldDefinition;
 import ai.vespa.intellij.schema.psi.SdSummaryDefinition;
 import ai.vespa.intellij.schema.psi.SdTypes;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,7 +43,7 @@ import java.util.List;
  */
 public class SdUtil {
     
-    public static @NotNull HashMap<String, List<PsiElement>> createMacrosMap(SdFile file) {
+    public static HashMap<String, List<PsiElement>> createMacrosMap(SdFile file) {
         HashMap<String, List<PsiElement>> macrosMap = new HashMap<>();
         for (SdRankProfileDefinition rankProfile : PsiTreeUtil
             .findChildrenOfType(file, SdRankProfileDefinition.class)) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
index ab463562355..51a2e2490b3 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
@@ -10,8 +10,6 @@ import com.intellij.usages.rules.PsiElementUsage;
 import com.intellij.usages.rules.SingleParentUsageGroupingRule;
 import ai.vespa.intellij.schema.SdLanguage;
 import ai.vespa.intellij.schema.psi.SdDocumentSummaryDefinition;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * A Document Summary that groups elements in the "Find Usages" window.
@@ -21,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
 public class SdDocumentSummaryGroupingRule extends SingleParentUsageGroupingRule implements DumbAware {
     
     @Override
-    protected @Nullable UsageGroup getParentGroupFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) {
+    protected UsageGroup getParentGroupFor(Usage usage, UsageTarget[] targets) {
         PsiElement psiElement = usage instanceof PsiElementUsage ? ((PsiElementUsage)usage).getElement() : null;
         if (psiElement == null || psiElement.getLanguage() != SdLanguage.INSTANCE) return null;
     
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
index 76b82d7c857..5c11622446e 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
@@ -4,8 +4,6 @@ package ai.vespa.intellij.schema.findUsages;
 import com.intellij.openapi.project.Project;
 import com.intellij.usages.impl.FileStructureGroupRuleProvider;
 import com.intellij.usages.rules.UsageGroupingRule;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdDocumentSummaryGroupingRule.
@@ -15,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 public class SdDocumentSummaryGroupingRuleProvider implements FileStructureGroupRuleProvider {
     
     @Override
-    public @Nullable UsageGroupingRule getUsageGroupingRule(@NotNull Project project) {
+    public UsageGroupingRule getUsageGroupingRule(Project project) {
         return new SdDocumentSummaryGroupingRule();
     }
 }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
index 4609f2e7fbb..07807cd36f8 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
@@ -16,7 +16,6 @@ import com.intellij.util.Processor;
 import ai.vespa.intellij.schema.SdUtil;
 import ai.vespa.intellij.schema.psi.SdFile;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.List;
@@ -30,16 +29,16 @@ public class SdFindUsagesHandler extends FindUsagesHandler {
     
     protected HashMap<String, List<PsiElement>> macrosMap;
     
-    protected SdFindUsagesHandler(@NotNull PsiElement psiElement) {
+    protected SdFindUsagesHandler(PsiElement psiElement) {
         super(psiElement);
         PsiFile file = psiElement.getContainingFile();
         macrosMap = file instanceof SdFile ? SdUtil.createMacrosMap((SdFile) psiElement.getContainingFile()) : new HashMap<>();
     }
     
     @Override
-    public boolean processElementUsages(@NotNull final PsiElement elementToSearch,
-                                        @NotNull final Processor<? super UsageInfo> processor,
-                                        @NotNull final FindUsagesOptions options) {
+    public boolean processElementUsages(PsiElement elementToSearch,
+                                        Processor<? super UsageInfo> processor,
+                                        FindUsagesOptions options) {
         final ReadActionProcessor<PsiReference> refProcessor = new ReadActionProcessor<>() {
             @Override
             public boolean processInReadAction(final PsiReference ref) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
index 98be15778e7..4b7ef552fa0 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
@@ -5,8 +5,6 @@ import com.intellij.find.findUsages.FindUsagesHandler;
 import com.intellij.find.findUsages.FindUsagesHandlerFactory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdFindUsagesHandler.
@@ -16,13 +14,13 @@ import org.jetbrains.annotations.Nullable;
 public class SdFindUsagesHandlerFactory extends FindUsagesHandlerFactory {
     
     @Override
-    public boolean canFindUsages(@NotNull PsiElement element) {
+    public boolean canFindUsages(PsiElement element) {
         return element instanceof PsiNamedElement;
     }
     
     @Override
-    public @Nullable FindUsagesHandler createFindUsagesHandler(@NotNull PsiElement element,
-                                                               boolean forHighlightUsages) {
+    public FindUsagesHandler createFindUsagesHandler(PsiElement element, boolean forHighlightUsages) {
         return new SdFindUsagesHandler(element);
     }
+
 }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
index a86fb2b058b..bd79f007fde 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
@@ -13,8 +13,6 @@ import ai.vespa.intellij.schema.psi.SdIdentifierVal;
 import ai.vespa.intellij.schema.psi.SdIdentifierWithDashVal;
 import ai.vespa.intellij.schema.psi.SdTypes;
 import ai.vespa.intellij.schema.psi.impl.SdNamedElementImpl;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable "find Usages" window using the plugin code.
@@ -23,8 +21,6 @@ import org.jetbrains.annotations.Nullable;
  */
 public class SdFindUsagesProvider implements FindUsagesProvider {
 
-    @Nullable
-    @Override
     public WordsScanner getWordsScanner() {
         return new DefaultWordsScanner(new SdLexerAdapter(),
                                        TokenSet.create(SdTypes.ID_REG, SdTypes.ID_WITH_DASH_REG, SdTypes.IDENTIFIER_VAL,
@@ -34,19 +30,17 @@ public class SdFindUsagesProvider implements FindUsagesProvider {
     }
 
     @Override
-    public boolean canFindUsagesFor(@NotNull PsiElement psiElement) {
+    public boolean canFindUsagesFor(PsiElement psiElement) {
         return psiElement instanceof PsiNamedElement;
     }
 
-    @Nullable
     @Override
-    public String getHelpId(@NotNull PsiElement psiElement) {
+    public String getHelpId(PsiElement psiElement) {
         return null;
     }
 
-    @NotNull
     @Override
-    public String getType(@NotNull PsiElement element) {
+    public String getType(PsiElement element) {
         if (element instanceof SdDeclaration) {
             return ((SdNamedElementImpl) element).getTypeName();
         } else {
@@ -54,15 +48,13 @@ public class SdFindUsagesProvider implements FindUsagesProvider {
         }
     }
 
-    @NotNull
     @Override
-    public String getDescriptiveName(@NotNull PsiElement element) {
+    public String getDescriptiveName(PsiElement element) {
         return "";
     }
 
-    @NotNull
     @Override
-    public String getNodeText(@NotNull PsiElement element, boolean useFullName) {
+    public String getNodeText(PsiElement element, boolean useFullName) {
         if (element instanceof SdIdentifierVal || element instanceof SdIdentifierWithDashVal) {
             String name = ((PsiNamedElement) element).getName();
             return name != null ? name : "";
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
index fd3073b6016..a9e9f9337dd 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
@@ -10,8 +10,6 @@ import com.intellij.usages.rules.PsiElementUsage;
 import com.intellij.usages.rules.SingleParentUsageGroupingRule;
 import ai.vespa.intellij.schema.SdLanguage;
 import ai.vespa.intellij.schema.psi.SdRankProfileDefinition;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * A Rank Profile that groups elements in the "Find Usages" window.
@@ -21,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
 public class SdRankProfileGroupingRule extends SingleParentUsageGroupingRule implements DumbAware {
 
     @Override
-    protected @Nullable UsageGroup getParentGroupFor(@NotNull Usage usage, UsageTarget @NotNull [] targets) {
+    protected UsageGroup getParentGroupFor(Usage usage, UsageTarget[] targets) {
         PsiElement psiElement = usage instanceof PsiElementUsage ? ((PsiElementUsage)usage).getElement() : null;
         if (psiElement == null || psiElement.getLanguage() != SdLanguage.INSTANCE) return null;
         
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
index 0726e103943..62a83500235 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
@@ -4,8 +4,6 @@ package ai.vespa.intellij.schema.findUsages;
 import com.intellij.openapi.project.Project;
 import com.intellij.usages.impl.FileStructureGroupRuleProvider;
 import com.intellij.usages.rules.UsageGroupingRule;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdRankProfileGroupingRule.
@@ -15,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 public class SdRankProfileGroupingRuleProvider implements FileStructureGroupRuleProvider {
 
     @Override
-    public @Nullable UsageGroupingRule getUsageGroupingRule(@NotNull Project project) {
+    public UsageGroupingRule getUsageGroupingRule(Project project) {
         return new SdRankProfileGroupingRule();
     }
 
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
index 6f24ce27476..7735255a84e 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
@@ -11,8 +11,6 @@ import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.usages.UsageGroup;
 import com.intellij.usages.UsageView;
 import ai.vespa.intellij.schema.psi.SdDeclaration;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
@@ -61,7 +59,7 @@ public class SdUsageGroup implements UsageGroup {
     }
 
     @Override
-    public int compareTo(@NotNull UsageGroup usageGroup) {
+    public int compareTo(UsageGroup usageGroup) {
 //        return getPresentableGroupText().compareToIgnoreCase(usageGroup.getPresentableGroupText());
         return getText(null).compareTo(usageGroup.getText(null));
     }
@@ -86,12 +84,12 @@ public class SdUsageGroup implements UsageGroup {
     }
 
     @Override
-    public @NotNull String getPresentableGroupText() {
+    public String getPresentableGroupText() {
         return myText;
     }
     
     @Override
-    public @Nullable Icon getIcon() {
+    public Icon getIcon() {
         return myIcon;
     }
     
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
index 38817e15553..19a47ba15d4 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
@@ -12,8 +12,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ObjectUtils;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -27,37 +25,33 @@ import javax.swing.JTree;
  */
 public class SdCallHierarchyBrowser extends CallHierarchyBrowserBase {
 
-    public SdCallHierarchyBrowser(@NotNull Project project,
-                                  @NotNull PsiElement macro) {
+    public SdCallHierarchyBrowser(Project project, PsiElement macro) {
         super(project, macro);
     }
 
-    @Nullable
     @Override
-    protected PsiElement getElementFromDescriptor(@NotNull HierarchyNodeDescriptor descriptor) {
+    protected PsiElement getElementFromDescriptor(HierarchyNodeDescriptor descriptor) {
         return ObjectUtils.tryCast(descriptor.getPsiElement(), PsiElement.class);
     }
 
     @Override
-    protected void createTrees(@NotNull Map<? super String, ? super JTree> type2TreeMap) {
+    protected void createTrees(Map<? super String, ? super JTree> type2TreeMap) {
         ActionGroup group = (ActionGroup) ActionManager.getInstance().getAction(IdeActions.GROUP_CALL_HIERARCHY_POPUP);
         type2TreeMap.put(getCallerType(), createHierarchyTree(group));
         type2TreeMap.put(getCalleeType(), createHierarchyTree(group));
     }
 
-    private @NotNull JTree createHierarchyTree(ActionGroup group) {
+    private JTree createHierarchyTree(ActionGroup group) {
         return createTree(false);
     }
 
     @Override
-    protected boolean isApplicableElement(@NotNull PsiElement element) {
+    protected boolean isApplicableElement(PsiElement element) {
         return element instanceof SdFunctionDefinition;
     }
     
-
-    @Nullable
     @Override
-    protected HierarchyTreeStructure createHierarchyTreeStructure(@NotNull String typeName, @NotNull PsiElement psiElement) {
+    protected HierarchyTreeStructure createHierarchyTreeStructure(String typeName, PsiElement psiElement) {
         if (getCallerType().equals(typeName)) {
             return new SdCallerTreeStructure(myProject, psiElement, getCurrentScopeType());
         }
@@ -69,7 +63,6 @@ public class SdCallHierarchyBrowser extends CallHierarchyBrowserBase {
         }
     }
 
-    @Nullable
     @Override
     protected Comparator<NodeDescriptor<?>> getComparator() {
         return SdHierarchyUtil.getComparator(myProject);
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
index f99a82dc81a..62734cc1168 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
@@ -16,8 +16,6 @@ import ai.vespa.intellij.schema.psi.SdFirstPhaseDefinition;
 import ai.vespa.intellij.schema.psi.impl.SdFirstPhaseDefinitionMixin;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
 
-import org.jetbrains.annotations.NotNull;
-
 import javax.swing.Icon;
 
 /**
@@ -27,7 +25,7 @@ import javax.swing.Icon;
  */
 public class SdCallHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
 
-    public SdCallHierarchyNodeDescriptor(final NodeDescriptor parentDescriptor, @NotNull final PsiElement element, final boolean isBase) {
+    public SdCallHierarchyNodeDescriptor(NodeDescriptor parentDescriptor, PsiElement element, boolean isBase) {
         super(element.getProject(), parentDescriptor, element, isBase);
         CompositeAppearance.DequeEnd beginning = myHighlightedText.getBeginning();
         if (element instanceof SdFunctionDefinition) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
index f7f243356b9..8319e5c46ac 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
@@ -12,8 +12,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
 import ai.vespa.intellij.schema.psi.SdIdentifierVal;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.Project;
 
@@ -25,7 +23,7 @@ import com.intellij.openapi.project.Project;
 public class SdCallHierarchyProvider implements HierarchyProvider {
 
     @Override
-    public @Nullable PsiElement getTarget(@NotNull DataContext dataContext) {
+    public PsiElement getTarget(DataContext dataContext) {
         final Project project = CommonDataKeys.PROJECT.getData(dataContext);
         final Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
         if (project == null || editor == null) return null;
@@ -53,12 +51,12 @@ public class SdCallHierarchyProvider implements HierarchyProvider {
     }
 
     @Override
-    public @NotNull HierarchyBrowser createHierarchyBrowser(@NotNull PsiElement target) {
+    public HierarchyBrowser createHierarchyBrowser(PsiElement target) {
         return new SdCallHierarchyBrowser(target.getProject(), target);
     }
 
     @Override
-    public void browserActivated(@NotNull HierarchyBrowser hierarchyBrowser) {
+    public void browserActivated(HierarchyBrowser hierarchyBrowser) {
         ((SdCallHierarchyBrowser) hierarchyBrowser).changeView(CallHierarchyBrowserBase.getCallerType());
     }
 
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
index 053e7bd20f9..3dae0d8c818 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
@@ -12,7 +12,6 @@ import ai.vespa.intellij.schema.SdUtil;
 import ai.vespa.intellij.schema.psi.SdFile;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
 import ai.vespa.intellij.schema.psi.SdRankProfileDefinition;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -39,11 +38,10 @@ public abstract class SdCallTreeStructure extends HierarchyTreeStructure {
         ranksHeritageMap = new HashMap<>();
     }
     
-    @NotNull
-    protected abstract HashSet<PsiElement> getChildren(@NotNull SdFunctionDefinition element);
+    protected abstract HashSet<PsiElement> getChildren(SdFunctionDefinition element);
     
     @Override
-    protected Object @NotNull [] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) {
+    protected Object[] buildChildren(HierarchyNodeDescriptor descriptor) {
         final List<SdCallHierarchyNodeDescriptor> descriptors = new ArrayList<>();
         
         if (descriptor instanceof SdCallHierarchyNodeDescriptor) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
index 37fd336b615..59e6ca7add3 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
@@ -10,7 +10,6 @@ import ai.vespa.intellij.schema.psi.SdExpressionDefinition;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
 import ai.vespa.intellij.schema.psi.SdIdentifier;
 import ai.vespa.intellij.schema.psi.SdRankProfileDefinition;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -27,13 +26,12 @@ public class SdCalleeTreeStructure extends SdCallTreeStructure {
         super(project, element, currentScopeType);
     }
         
-    @NotNull
     @Override
-    protected HashSet<PsiElement> getChildren(@NotNull SdFunctionDefinition element) {
+    protected HashSet<PsiElement> getChildren(SdFunctionDefinition element) {
         return getCallees(element, macrosMap);
     }
     
-    private HashSet<PsiElement> getCallees(@NotNull SdFunctionDefinition macro, HashMap<String, List<PsiElement>> macrosMap) {
+    private HashSet<PsiElement> getCallees(SdFunctionDefinition macro, HashMap<String, List<PsiElement>> macrosMap) {
         final HashSet<PsiElement> results = new HashSet<>();
         SdExpressionDefinition expression = PsiTreeUtil.findChildOfType(macro, SdExpressionDefinition.class);
         if (expression == null) {
@@ -69,5 +67,4 @@ public class SdCalleeTreeStructure extends SdCallTreeStructure {
         return results;
     }
     
-    
 }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
index 444e71978c9..f442c4ea5bc 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
@@ -11,7 +11,6 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.ContainerUtil;
 import ai.vespa.intellij.schema.psi.SdFirstPhaseDefinition;
 import ai.vespa.intellij.schema.psi.SdFunctionDefinition;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,13 +31,12 @@ public class SdCallerTreeStructure extends SdCallTreeStructure {
         macroTreeChildren = new HashMap<>();
     }
     
-    @NotNull
     @Override
-    protected HashSet<PsiElement> getChildren(@NotNull SdFunctionDefinition element) {
+    protected HashSet<PsiElement> getChildren(SdFunctionDefinition element) {
         return getCallers(element, macrosMap);
     }
     
-    private HashSet<PsiElement> getCallers(@NotNull SdFunctionDefinition macro, @NotNull HashMap<String, List<PsiElement>> macrosMap) {
+    private HashSet<PsiElement> getCallers(SdFunctionDefinition macro, HashMap<String, List<PsiElement>> macrosMap) {
         String macroName = macro.getName();
 
         if (macroTreeChildren.containsKey(macroName)) {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
index d5b76c039d0..afca26eb5cb 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
@@ -16,7 +16,6 @@ import ai.vespa.intellij.schema.SdLanguage;
 import ai.vespa.intellij.schema.lexer.SdLexerAdapter;
 import ai.vespa.intellij.schema.psi.SdFile;
 import ai.vespa.intellij.schema.psi.SdTypes;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml), to make the parsing process use the plugin code.
@@ -31,55 +30,46 @@ public class SdParserDefinition implements ParserDefinition {
     
     public static final IFileElementType FILE = new IFileElementType(SdLanguage.INSTANCE);
     
-    @NotNull
     @Override
     public Lexer createLexer(Project project) {
         return new SdLexerAdapter();
     }
     
-    @NotNull
     @Override
     public PsiParser createParser(final Project project) {
         return new SdParser();
     }
     
-    @NotNull
     @Override
     public TokenSet getWhitespaceTokens() {
         return WHITE_SPACES;
     }
     
-    @NotNull
     @Override
     public TokenSet getCommentTokens() {
         return COMMENTS;
     }
     
-    @NotNull
     @Override
     public TokenSet getStringLiteralElements() {
         return STRINGS;
     }
     
-    @NotNull
     @Override
     public IFileElementType getFileNodeType() {
         return FILE;
     }
     
-    @NotNull
     @Override
-    public PsiFile createFile(@NotNull FileViewProvider viewProvider) {
+    public PsiFile createFile(FileViewProvider viewProvider) {
         return new SdFile(viewProvider);
     }
     
-    @NotNull
     @Override
     public SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) {
         return SpaceRequirements.MAY;
     }
     
-    @NotNull
     @Override
     public PsiElement createElement(ASTNode node) {
         return SdTypes.Factory.createElement(node);
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
index 7cd2d7f9331..028a034c08f 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
@@ -5,8 +5,6 @@ import com.intellij.psi.ElementDescriptionLocation;
 import com.intellij.psi.ElementDescriptionProvider;
 import com.intellij.psi.PsiElement;
 import ai.vespa.intellij.schema.psi.impl.SdNamedElementImpl;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable "find Usages" window take the element description from 
@@ -22,9 +20,8 @@ public class SdElementDescriptionProvider implements ElementDescriptionProvider
      * @param psiElement the element to describe
      * @return a string with the description to write in the headline
      */
-    @Nullable
     @Override
-    public String getElementDescription(@NotNull PsiElement psiElement, @NotNull ElementDescriptionLocation elementDescriptionLocation) {
+    public String getElementDescription(PsiElement psiElement, ElementDescriptionLocation elementDescriptionLocation) {
         if (psiElement instanceof SdDeclaration) {
             return ((SdNamedElementImpl) psiElement).getTypeName();
         } else {
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
index e8154bce8ad..2f044168a0a 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
@@ -3,8 +3,6 @@ package ai.vespa.intellij.schema.psi;
 
 import com.intellij.psi.tree.IElementType;
 import ai.vespa.intellij.schema.SdLanguage;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * An SdElementType.
@@ -13,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SdElementType extends IElementType {
     
-    public SdElementType(@NotNull @NonNls String debugName) {
+    public SdElementType(String debugName) {
         super(debugName, SdLanguage.INSTANCE);
     }
 
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
index 1260883c96f..fae8d7aa7e4 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
 import ai.vespa.intellij.schema.SdFileType;
 import ai.vespa.intellij.schema.SdLanguage;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * An SD file.
@@ -15,11 +14,10 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SdFile extends PsiFileBase {
     
-    public SdFile(@NotNull FileViewProvider viewProvider) {
+    public SdFile(FileViewProvider viewProvider) {
         super(viewProvider, SdLanguage.INSTANCE);
     }
     
-    @NotNull
     @Override
     public FileType getFileType() {
         return SdFileType.INSTANCE;
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
index e42906530b0..f68fcf1ce59 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
@@ -3,8 +3,6 @@ package ai.vespa.intellij.schema.psi;
 
 import com.intellij.psi.tree.IElementType;
 import ai.vespa.intellij.schema.SdLanguage;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * An SdTokenType.
@@ -13,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SdTokenType extends IElementType {
     
-    public SdTokenType(@NotNull @NonNls String debugName) {
+    public SdTokenType(String debugName) {
         super(debugName, SdLanguage.INSTANCE);
     }
     
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
index 43c02ea4fcf..e02f5d13779 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
@@ -7,8 +7,6 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.util.PsiTreeUtil;
 import ai.vespa.intellij.schema.SdIcons;
 import ai.vespa.intellij.schema.psi.SdRankProfileDefinition;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
 
@@ -20,11 +18,10 @@ import javax.swing.Icon;
  */
 public class SdFirstPhaseDefinitionMixin extends ASTWrapperPsiElement {
     
-    public SdFirstPhaseDefinitionMixin(@NotNull ASTNode node) {
+    public SdFirstPhaseDefinitionMixin(ASTNode node) {
         super(node);
     }
     
-    @NotNull
     public String getName() {
         SdRankProfileDefinition rankProfile = PsiTreeUtil.getParentOfType(this, SdRankProfileDefinition.class);
         if (rankProfile == null) {
@@ -45,7 +42,6 @@ public class SdFirstPhaseDefinitionMixin extends ASTWrapperPsiElement {
                 return "first-phase of " + rankProfile.getName();
             }
             
-            @Nullable
             @Override
             public String getLocationString() {
                 return element.getContainingFile() != null ? element.getContainingFile().getName() : null;
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
index 897217c082c..e7ea4bbcb59 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
@@ -7,7 +7,6 @@ import com.intellij.psi.PsiNamedElement;
 import ai.vespa.intellij.schema.psi.SdElementFactory;
 import ai.vespa.intellij.schema.psi.SdIdentifier;
 import ai.vespa.intellij.schema.psi.SdIdentifierVal;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This abstract class is used for methods' implementations for SdIdentifier. Connected with "mixin" to IdentifierVal and 
@@ -17,18 +16,16 @@ import org.jetbrains.annotations.NotNull;
  */
 public abstract class SdIdentifierMixin extends SdIdentifierMixinImpl implements PsiNamedElement {
     
-    public SdIdentifierMixin(@NotNull ASTNode node) {
+    public SdIdentifierMixin(ASTNode node) {
         super(node);
     }
     
-    @NotNull
     public String getName() {
         // IMPORTANT: Convert embedded escaped spaces to simple spaces
         return this.getText().replaceAll("\\\\ ", " ");
     }
     
-    @NotNull
-    public PsiElement setName(@NotNull String newName) {
+    public PsiElement setName(String newName) {
         ASTNode node =  this.getNode().getFirstChildNode();
         if (node != null) {
             SdIdentifier elementName;
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
index 3f69952d0b6..f557ae2618b 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
@@ -7,7 +7,6 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiReference;
 import ai.vespa.intellij.schema.SdReference;
 import ai.vespa.intellij.schema.psi.SdIdentifier;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for methods' implementations for SdIdentifier. The abstract class SdIdentifierMixin extents it.
@@ -16,11 +15,10 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SdIdentifierMixinImpl extends ASTWrapperPsiElement implements SdIdentifier {
     
-    public SdIdentifierMixinImpl(@NotNull ASTNode node) {
+    public SdIdentifierMixinImpl(ASTNode node) {
         super(node);
     }
     
-    @NotNull
     public PsiReference getReference() {
         return new SdReference(this, new TextRange(0, getNode().getText().length()));
     }
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
index ee328f43075..04a8b981fb9 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
@@ -30,8 +30,6 @@ import ai.vespa.intellij.schema.psi.SdSchemaAnnotationDefinition;
 import ai.vespa.intellij.schema.psi.SdSchemaFieldDefinition;
 import ai.vespa.intellij.schema.psi.SdStructFieldDefinition;
 import ai.vespa.intellij.schema.psi.SdTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
 
@@ -42,11 +40,10 @@ import javax.swing.Icon;
  */
 public abstract class SdNamedElementImpl extends ASTWrapperPsiElement implements SdNamedElement {
     
-    public SdNamedElementImpl(@NotNull ASTNode node) {
+    public SdNamedElementImpl(ASTNode node) {
         super(node);
     }
     
-    @NotNull
     public String getName() {
         ASTNode node;
         if (this instanceof SdImportFieldDefinition) {
@@ -106,8 +103,7 @@ public abstract class SdNamedElementImpl extends ASTWrapperPsiElement implements
         }
     }
     
-    @NotNull
-    public PsiElement setName(@NotNull String newName) {
+    public PsiElement setName(String newName) {
         ASTNode node;
         if (this instanceof SdImportFieldDefinition) {
             ASTNode asNode = this.getNode().findChildByType(SdTypes.AS);
@@ -144,7 +140,6 @@ public abstract class SdNamedElementImpl extends ASTWrapperPsiElement implements
     public ItemPresentation getPresentation() {
         final SdNamedElement element = this;
         return new ItemPresentation() {
-            @Nullable
             @Override
             public String getPresentableText() {
                 if (element instanceof SdFunctionDefinition) {
@@ -160,13 +155,11 @@ public abstract class SdNamedElementImpl extends ASTWrapperPsiElement implements
                 return element.getName();
             }
             
-            @Nullable
             @Override
             public String getLocationString() {
                 return element.getContainingFile() != null ? element.getContainingFile().getName() : null;
             }
             
-            @Nullable
             @Override
             public Icon getIcon(boolean unused) {
                 if (element instanceof SdSchemaFieldDefinition || element instanceof SdDocumentFieldDefinition || 
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
index 71d93641939..8c7167d6e50 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
@@ -6,8 +6,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import ai.vespa.intellij.schema.SdIcons;
 import ai.vespa.intellij.schema.psi.SdTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.Icon;
 
@@ -19,11 +17,10 @@ import javax.swing.Icon;
  */
 public abstract class SdSummaryDefinitionMixin extends ASTWrapperPsiElement {
     
-    public SdSummaryDefinitionMixin(@NotNull ASTNode node) {
+    public SdSummaryDefinitionMixin(ASTNode node) {
         super(node);
     }
     
-    @NotNull
     public String getName() {
         ASTNode node;
         node = this.getNode().findChildByType(SdTypes.IDENTIFIER_WITH_DASH_VAL);
@@ -44,7 +41,6 @@ public abstract class SdSummaryDefinitionMixin extends ASTWrapperPsiElement {
                 return getName();
             }
             
-            @Nullable
             @Override
             public String getLocationString() {
                 return element.getContainingFile() != null ? element.getContainingFile().getName() : null;
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
index 76662c5cd31..10384c2a34c 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
@@ -16,7 +16,6 @@ import ai.vespa.intellij.schema.psi.SdDocumentSummaryDefinition;
 import ai.vespa.intellij.schema.psi.SdFile;
 import ai.vespa.intellij.schema.psi.SdRankProfileDefinition;
 import ai.vespa.intellij.schema.psi.SdSchemaAnnotationDefinition;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,14 +53,12 @@ public class SdStructureViewElement implements StructureViewTreeElement, Sortabl
         return myElement.canNavigateToSource();
     }
     
-    @NotNull
     @Override
     public String getAlphaSortKey() {
         String name = myElement.getName();
         return name != null ? name : "";
     }
     
-    @NotNull
     @Override
     public ItemPresentation getPresentation() {
         ItemPresentation presentation = myElement.getPresentation();
@@ -69,7 +66,7 @@ public class SdStructureViewElement implements StructureViewTreeElement, Sortabl
     }
     
     @Override
-    public TreeElement @NotNull [] getChildren() {
+    public TreeElement[] getChildren() {
         List<PsiElement> children = new ArrayList<>();
         if (myElement instanceof SdFile) {
             children = SdUtil.findSchemaChildren(myElement);
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
index 3d7b3a1a275..9e4fd596a5a 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
@@ -7,8 +7,6 @@ import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
 import com.intellij.lang.PsiStructureViewFactory;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdStructureViewModel. It make the IDE use our 
@@ -18,13 +16,10 @@ import org.jetbrains.annotations.Nullable;
  */
 public class SdStructureViewFactory implements PsiStructureViewFactory {
 
-    @Nullable
-    @Override
-    public StructureViewBuilder getStructureViewBuilder(@NotNull final PsiFile psiFile) {
+    public StructureViewBuilder getStructureViewBuilder(PsiFile psiFile) {
         return new TreeBasedStructureViewBuilder() {
-            @NotNull
             @Override
-            public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
+            public StructureViewModel createStructureViewModel(Editor editor) {
                 return new SdStructureViewModel(psiFile);
             }
         };
diff --git a/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
index 1f1c271dcf6..7282c74288f 100644
--- a/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
+++ b/integration/intellij/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
@@ -6,7 +6,6 @@ import com.intellij.ide.structureView.StructureViewModelBase;
 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.ide.util.treeView.smartTree.Sorter;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * This class represents the "Structure View" window.
@@ -14,16 +13,15 @@ import org.jetbrains.annotations.NotNull;
  * @author Shahar Ariel
  */
 public class SdStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider {
+
     public SdStructureViewModel(PsiFile psiFile) {
         super(psiFile, new SdStructureViewElement(psiFile));
     }
-    
-    
-    public Sorter @NotNull [] getSorters() {
+
+    public Sorter[] getSorters() {
         return new Sorter[]{Sorter.ALPHA_SORTER};
     }
 
-
     @Override
     public boolean isAlwaysShowsPlus(StructureViewTreeElement element) {
         return false;