@@ -1,6 +1,7 @@
 # Todo
 
 ## Bugs
+* autoc|() should'nt add an extra () before the existing one
 * import static org.| doesn't auto-complete
 * array.length doesn't auto-complete
 * Hover doesn't show 'throws ...'
 
@@ -384,8 +384,9 @@ private Stream<CompletionItem> notImportedClasses(String partialIdentifier, Scop
         Stream<String> fromSourcePath =
                 accessibleSourcePathClasses(partialIdentifier, scope).map(c -> c.qualifiedName());
         Stream<String> fromClassPath =
-                accessibleClassPathClasses(partialIdentifier, scope).map(c -> c.getName());
-        // TODO remove class path classes that are also available from source path
+                accessibleClassPathClasses(partialIdentifier, scope)
+                        .map(c -> c.getName())
+                        .filter(name -> !sourcePath.isTopLevelClass(name));
 
         return Stream.concat(fromSourcePath, fromClassPath)
                 .map(this::completeClassNameFromClassPath);
 
@@ -247,6 +247,10 @@ private String packageName() {
         }
     }
 
+    boolean isTopLevelClass(String qualifiedName) {
+        return doFindDeclaringFile(qualifiedName).isPresent();
+    }
+
     Stream<ReachableClass> accessibleTopLevelClasses(String fromPackage) {
         finishedInitialIndex.join();
 
@@ -270,8 +274,13 @@ Stream<ReachableClass> allTopLevelClasses() {
     Optional<URI> findDeclaringFile(TypeElement topLevelClass) {
         updateOpenFiles();
 
-        String qualifiedName = topLevelClass.getQualifiedName().toString(),
-                packageName = Completions.mostIds(qualifiedName),
+        String qualifiedName = topLevelClass.getQualifiedName().toString();
+
+        return doFindDeclaringFile(qualifiedName);
+    }
+
+    private Optional<URI> doFindDeclaringFile(String qualifiedName) {
+        String packageName = Completions.mostIds(qualifiedName),
                 className = Completions.lastId(qualifiedName);
         Predicate<Map.Entry<URI, SourceFileIndex>> containsClass =
                 entry -> {
 
@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.net.URLClassLoader;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.eclipse.lsp4j.CompletionItem;
@@ -746,4 +747,14 @@ public void withinConstructor() throws IOException {
 
         assertThat("suggests local variable", suggestions, hasItems("length"));
     }
+
+    @Test
+    public void onlySuggestOnce() throws IOException {
+        String file = "/org/javacs/example/AutocompleteOnce.java";
+
+        Map<String, Integer> suggestions = insertCount(file, 5, 18);
+
+        assertThat("suggests Signatures", suggestions, hasKey("Signatures"));
+        assertThat("suggests Signatures only once", suggestions, hasEntry("Signatures", 1));
+    }
 }
@@ -0,0 +1,7 @@
+package org.javacs.example;
+
+public class AutocompleteOnce {
+    public void test() {
+        Signature
+    }
+}