diff --git a/core/src/main/java/hudson/cli/BuildCommand.java b/core/src/main/java/hudson/cli/BuildCommand.java
index cd6a13efa1dbae62a404f3e50a73a332b02394a2..8cd09281c52c1eb930db6dede5900c1731d42f81 100644
--- a/core/src/main/java/hudson/cli/BuildCommand.java
+++ b/core/src/main/java/hudson/cli/BuildCommand.java
@@ -89,7 +89,7 @@ public class BuildCommand extends CLICommand {
     public boolean checkSCM = false;
 
     @Option(name="-p",usage="Specify the build parameters in the key=value format.")
-    public Map<String,String> parameters = new HashMap<String, String>();
+    public Map<String,String> parameters = new HashMap<>();
 
     @Option(name="-v",usage="Prints out the console output of the build. Use with -s")
     public boolean consoleOutput = false;
@@ -109,7 +109,7 @@ public class BuildCommand extends CLICommand {
                 throw new IllegalStateException(job.getFullDisplayName()+" is not parameterized but the -p option was specified.");
 
             //TODO: switch to type annotations after the migration to Java 1.8
-            List<ParameterValue> values = new ArrayList<ParameterValue>();
+            List<ParameterValue> values = new ArrayList<>();
 
             for (Entry<String, String> e : parameters.entrySet()) {
                 String name = e.getKey();
diff --git a/core/src/main/java/hudson/cli/CLIAction.java b/core/src/main/java/hudson/cli/CLIAction.java
index 2c37db46cc0ed3e52184fe7d9ef9cb264bbca21b..f9b0ef6d92472d9bf677e9003049805d7bf9d66b 100644
--- a/core/src/main/java/hudson/cli/CLIAction.java
+++ b/core/src/main/java/hudson/cli/CLIAction.java
@@ -250,7 +250,7 @@ public class CLIAction implements UnprotectedRootAction, StaplerProxy {
             // do not require any permission to establish a CLI connection
             // the actual authentication for the connecting Channel is done by CLICommand
 
-            return new FullDuplexHttpChannel(uuid, !Jenkins.getInstance().hasPermission(Jenkins.ADMINISTER)) {
+            return new FullDuplexHttpChannel(uuid, !Jenkins.get().hasPermission(Jenkins.ADMINISTER)) {
                 @SuppressWarnings("deprecation")
                 @Override
                 protected void main(Channel channel) throws IOException, InterruptedException {
diff --git a/core/src/main/java/hudson/cli/CLICommand.java b/core/src/main/java/hudson/cli/CLICommand.java
index 91d88118d1dcf99ca57a3bdc407c010e509b3d74..879f8989af41de507ba42d35614a29f8b63c7270 100644
--- a/core/src/main/java/hudson/cli/CLICommand.java
+++ b/core/src/main/java/hudson/cli/CLICommand.java
@@ -636,9 +636,9 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable {
      * Key for {@link Channel#getProperty(Object)} that links to the {@link Authentication} object
      * which captures the identity of the client given by the transport layer.
      */
-    public static final ChannelProperty<Authentication> TRANSPORT_AUTHENTICATION = new ChannelProperty<Authentication>(Authentication.class,"transportAuthentication");
+    public static final ChannelProperty<Authentication> TRANSPORT_AUTHENTICATION = new ChannelProperty<>(Authentication.class, "transportAuthentication");
 
-    private static final ThreadLocal<CLICommand> CURRENT_COMMAND = new ThreadLocal<CLICommand>();
+    private static final ThreadLocal<CLICommand> CURRENT_COMMAND = new ThreadLocal<>();
 
     /*package*/ static CLICommand setCurrent(CLICommand cmd) {
         CLICommand old = getCurrent();
@@ -656,7 +656,7 @@ public abstract class CLICommand implements ExtensionPoint, Cloneable {
     static {
         // register option handlers that are defined
         ClassLoaders cls = new ClassLoaders();
-        Jenkins j = Jenkins.getActiveInstance();
+        Jenkins j = Jenkins.getInstanceOrNull();
         if (j!=null) {// only when running on the master
             cls.put(j.getPluginManager().uberClassLoader);
 
diff --git a/core/src/main/java/hudson/cli/ClearQueueCommand.java b/core/src/main/java/hudson/cli/ClearQueueCommand.java
index 8e76a477aa12af83cf315b4c35a0e7253401a223..52cd7c4063880db362f7b6ea7df9580389fec70b 100644
--- a/core/src/main/java/hudson/cli/ClearQueueCommand.java
+++ b/core/src/main/java/hudson/cli/ClearQueueCommand.java
@@ -26,7 +26,6 @@ package hudson.cli;
 
 import hudson.Extension;
 import jenkins.model.Jenkins;
-import org.acegisecurity.AccessDeniedException;
 
 import java.util.logging.Logger;
 
diff --git a/core/src/main/java/hudson/cli/CliManagerImpl.java b/core/src/main/java/hudson/cli/CliManagerImpl.java
index 750a38d210af7cb8f267086346715b3981129b50..d799e6bf997a8a4223bcc4b9ea8c1ce26eb6c9ce 100644
--- a/core/src/main/java/hudson/cli/CliManagerImpl.java
+++ b/core/src/main/java/hudson/cli/CliManagerImpl.java
@@ -90,7 +90,7 @@ public class CliManagerImpl implements CliEntryPoint, Serializable {
             cmd.channel = Channel.current();
             final CLICommand old = CLICommand.setCurrent(cmd);
             try {
-                transportAuth = Channel.current().getProperty(CLICommand.TRANSPORT_AUTHENTICATION);
+                transportAuth = Channel.currentOrFail().getProperty(CLICommand.TRANSPORT_AUTHENTICATION);
                 cmd.setTransportAuth(transportAuth);
                 return cmd.main(args.subList(1,args.size()),locale, stdin, out, err);
             } finally {
@@ -99,7 +99,7 @@ public class CliManagerImpl implements CliEntryPoint, Serializable {
         }
 
         err.println("No such command: "+subCmd);
-        new HelpCommand().main(Collections.<String>emptyList(), locale, stdin, out, err);
+        new HelpCommand().main(Collections.emptyList(), locale, stdin, out, err);
         return -1;
     }
 
diff --git a/core/src/main/java/hudson/cli/ConnectNodeCommand.java b/core/src/main/java/hudson/cli/ConnectNodeCommand.java
index ae20f5e60848507503cca9f3ff0d3a21cb9c53a5..189d2b5406376a2e88c6411308aa991238d5339e 100644
--- a/core/src/main/java/hudson/cli/ConnectNodeCommand.java
+++ b/core/src/main/java/hudson/cli/ConnectNodeCommand.java
@@ -62,7 +62,7 @@ public class ConnectNodeCommand extends CLICommand {
         boolean errorOccurred = false;
         final Jenkins jenkins = Jenkins.getActiveInstance();
 
-        final HashSet<String> hs = new HashSet<String>();
+        final HashSet<String> hs = new HashSet<>();
         hs.addAll(nodes);
 
         List<String> names = null;
diff --git a/core/src/main/java/hudson/cli/CreateNodeCommand.java b/core/src/main/java/hudson/cli/CreateNodeCommand.java
index 6a7f6dee7698cf6f5f4dddeb2167dd5df003a51f..edab3f7e71ec2eda866dd7c12b32c1920d902c81 100644
--- a/core/src/main/java/hudson/cli/CreateNodeCommand.java
+++ b/core/src/main/java/hudson/cli/CreateNodeCommand.java
@@ -32,7 +32,6 @@ import hudson.model.User;
 import jenkins.model.Jenkins;
 
 import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.CmdLineException;
 
 /**
  * @author ogondza
diff --git a/core/src/main/java/hudson/cli/DeleteBuildsCommand.java b/core/src/main/java/hudson/cli/DeleteBuildsCommand.java
index bd1768786cd4c5bfd6e9df37547eda439b6a8632..b7c2531446b0c21462ab81f0863da28d6592a648 100644
--- a/core/src/main/java/hudson/cli/DeleteBuildsCommand.java
+++ b/core/src/main/java/hudson/cli/DeleteBuildsCommand.java
@@ -57,7 +57,7 @@ public class DeleteBuildsCommand extends RunRangeCommand {
     protected int act(List<Run<?, ?>> builds) throws IOException {
         job.checkPermission(Run.DELETE);
 
-        final HashSet<Integer> hsBuilds = new HashSet<Integer>();
+        final HashSet<Integer> hsBuilds = new HashSet<>();
 
         for (Run<?, ?> build : builds) {
             if (!hsBuilds.contains(build.number)) {
diff --git a/core/src/main/java/hudson/cli/DeleteJobCommand.java b/core/src/main/java/hudson/cli/DeleteJobCommand.java
index 199296f87fc48d09a14d289ef4c36cea8f05901f..03e63e8579da3f9b631577120b30bb873ab6d8ae 100644
--- a/core/src/main/java/hudson/cli/DeleteJobCommand.java
+++ b/core/src/main/java/hudson/cli/DeleteJobCommand.java
@@ -31,7 +31,6 @@ import org.kohsuke.args4j.Argument;
 
 import java.util.List;
 import java.util.HashSet;
-import java.util.logging.Logger;
 
 /**
  * CLI command, which deletes a job or multiple jobs.
@@ -56,7 +55,7 @@ public class DeleteJobCommand extends CLICommand {
         boolean errorOccurred = false;
         final Jenkins jenkins = Jenkins.getActiveInstance();
 
-        final HashSet<String> hs = new HashSet<String>();
+        final HashSet<String> hs = new HashSet<>();
         hs.addAll(jobs);
 
         for (String job_s: hs) {
diff --git a/core/src/main/java/hudson/cli/DeleteNodeCommand.java b/core/src/main/java/hudson/cli/DeleteNodeCommand.java
index 03001fccc3a10886fb164632952e426d31862ba7..60a8821e0f7134b396344ce4fc6078dd4c5eac24 100644
--- a/core/src/main/java/hudson/cli/DeleteNodeCommand.java
+++ b/core/src/main/java/hudson/cli/DeleteNodeCommand.java
@@ -31,7 +31,6 @@ import org.kohsuke.args4j.Argument;
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.logging.Logger;
 
 /**
  * CLI command, which deletes Jenkins nodes.
@@ -56,7 +55,7 @@ public class DeleteNodeCommand extends CLICommand {
         boolean errorOccurred = false;
         final Jenkins jenkins = Jenkins.getActiveInstance();
 
-        final HashSet<String> hs = new HashSet<String>();
+        final HashSet<String> hs = new HashSet<>();
         hs.addAll(nodes);
 
         for (String node_s : hs) {
diff --git a/core/src/main/java/hudson/cli/DeleteViewCommand.java b/core/src/main/java/hudson/cli/DeleteViewCommand.java
index 894978e683fcac696a634fcad383c199e5dec840..955a476ad96c009dac15484c864e180b8f337ce0 100644
--- a/core/src/main/java/hudson/cli/DeleteViewCommand.java
+++ b/core/src/main/java/hudson/cli/DeleteViewCommand.java
@@ -33,7 +33,6 @@ import org.kohsuke.args4j.Argument;
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.logging.Logger;
 
 /**
  * @author ogondza, pjanouse
@@ -57,7 +56,7 @@ public class DeleteViewCommand extends CLICommand {
         boolean errorOccurred = false;
 
         // Remove duplicates
-        final HashSet<String> hs = new HashSet<String>();
+        final HashSet<String> hs = new HashSet<>();
         hs.addAll(views);
 
         ViewOptionHandler voh = new ViewOptionHandler(null, null, null);
diff --git a/core/src/main/java/hudson/cli/DisconnectNodeCommand.java b/core/src/main/java/hudson/cli/DisconnectNodeCommand.java
index 65c95106eb5f8653007b8d62bf8aa5c8c5e987e0..ad003521d77a2025ad09eb5f9e16d6cc06e7f3bb 100644
--- a/core/src/main/java/hudson/cli/DisconnectNodeCommand.java
+++ b/core/src/main/java/hudson/cli/DisconnectNodeCommand.java
@@ -61,7 +61,7 @@ public class DisconnectNodeCommand extends CLICommand {
         boolean errorOccurred = false;
         final Jenkins jenkins = Jenkins.getActiveInstance();
 
-        final HashSet<String> hs = new HashSet<String>();
+        final HashSet<String> hs = new HashSet<>();
         hs.addAll(nodes);
 
         List<String> names = null;
diff --git a/core/src/main/java/hudson/cli/GroovyCommand.java b/core/src/main/java/hudson/cli/GroovyCommand.java
index e7b247951650711c23cffb22d1bc0273dc78e0f1..5e27f5478199f5f05c6d132e8b1f351e361cb7e6 100644
--- a/core/src/main/java/hudson/cli/GroovyCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyCommand.java
@@ -59,7 +59,7 @@ public class GroovyCommand extends CLICommand {
      * Remaining arguments.
      */
     @Argument(metaVar="ARGUMENTS", index=1, usage="Command line arguments to pass into script.")
-    public List<String> remaining = new ArrayList<String>();
+    public List<String> remaining = new ArrayList<>();
 
     protected int run() throws Exception {
         // this allows the caller to manipulate the JVM state, so require the execute script privilege.
diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java
index 31f998d0aa5be777ef55f2d4c1bfbf3aab4fe459..6bd34dc6911db8932473be2aa8f02a9b55bc523a 100644
--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
@@ -56,7 +56,7 @@ public class GroovyshCommand extends CLICommand {
         return Messages.GroovyshCommand_ShortDescription();
     }
 
-    @Argument(metaVar="ARGS") public List<String> args = new ArrayList<String>();
+    @Argument(metaVar="ARGS") public List<String> args = new ArrayList<>();
 
     @Override
     protected int run() {
diff --git a/core/src/main/java/hudson/cli/HelpCommand.java b/core/src/main/java/hudson/cli/HelpCommand.java
index 7b73c0b31dfef2993e39d773cfc47ad959cc3b06..071bce6a7fc49d9f400dfec4198d4a2acf04a796 100644
--- a/core/src/main/java/hudson/cli/HelpCommand.java
+++ b/core/src/main/java/hudson/cli/HelpCommand.java
@@ -65,7 +65,7 @@ public class HelpCommand extends CLICommand {
     }
 
     private int showAllCommands() {
-        Map<String,CLICommand> commands = new TreeMap<String,CLICommand>();
+        Map<String,CLICommand> commands = new TreeMap<>();
         for (CLICommand c : CLICommand.all())
             commands.put(c.getName(),c);
 
diff --git a/core/src/main/java/hudson/cli/InstallPluginCommand.java b/core/src/main/java/hudson/cli/InstallPluginCommand.java
index 5268df333f9a2b7ce78229621640fc1f88bc1c66..95f1e55f7782124bb2bc0b4692e8aa9d6455d19e 100644
--- a/core/src/main/java/hudson/cli/InstallPluginCommand.java
+++ b/core/src/main/java/hudson/cli/InstallPluginCommand.java
@@ -36,7 +36,6 @@ import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.HashSet;
@@ -166,7 +165,7 @@ public class InstallPluginCommand extends CLICommand {
                 if (h.getUpdateCenter().getSites().isEmpty()) {
                     stdout.println(Messages.InstallPluginCommand_NoUpdateCenterDefined());
                 } else {
-                    Set<String> candidates = new HashSet<String>();
+                    Set<String> candidates = new HashSet<>();
                     for (UpdateSite s : h.getUpdateCenter().getSites()) {
                         Data dt = s.getData();
                         if (dt==null)
diff --git a/core/src/main/java/hudson/cli/InstallToolCommand.java b/core/src/main/java/hudson/cli/InstallToolCommand.java
index ef8db698f99df0f20da2a91c5092fc8804870d93..4b06b51686bf04a2b30a98f030733435a0aaa352 100644
--- a/core/src/main/java/hudson/cli/InstallToolCommand.java
+++ b/core/src/main/java/hudson/cli/InstallToolCommand.java
@@ -78,11 +78,11 @@ public class InstallToolCommand extends CLICommand {
             throw new IllegalStateException("No such job found: "+id.job);
         p.checkPermission(Item.CONFIGURE);
 
-        List<String> toolTypes = new ArrayList<String>();
+        List<String> toolTypes = new ArrayList<>();
         for (ToolDescriptor<?> d : ToolInstallation.all()) {
             toolTypes.add(d.getDisplayName());
             if (d.getDisplayName().equals(toolType)) {
-                List<String> toolNames = new ArrayList<String>();
+                List<String> toolNames = new ArrayList<>();
                 for (ToolInstallation t : d.getInstallations()) {
                     toolNames.add(t.getName());
                     if (t.getName().equals(toolName))
diff --git a/core/src/main/java/hudson/cli/ListJobsCommand.java b/core/src/main/java/hudson/cli/ListJobsCommand.java
index 68c30dd0152d4af2f791a1a389d39ceb5bceb6a5..c358eced0860d959dcac231ef2295f10cac1d5a2 100644
--- a/core/src/main/java/hudson/cli/ListJobsCommand.java
+++ b/core/src/main/java/hudson/cli/ListJobsCommand.java
@@ -26,7 +26,6 @@ package hudson.cli;
 import java.util.Collection;
 
 import hudson.model.Item;
-import hudson.model.Items;
 import hudson.model.TopLevelItem;
 import hudson.model.View;
 import hudson.Extension;
diff --git a/core/src/main/java/hudson/cli/OfflineNodeCommand.java b/core/src/main/java/hudson/cli/OfflineNodeCommand.java
index e003a633b28ce80895a5257e74973918c7ee9a2b..39270918dcb8446506a24386a5497c42eef98350 100644
--- a/core/src/main/java/hudson/cli/OfflineNodeCommand.java
+++ b/core/src/main/java/hudson/cli/OfflineNodeCommand.java
@@ -34,7 +34,6 @@ import jenkins.model.Jenkins;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.Option;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
@@ -60,8 +59,8 @@ public class OfflineNodeCommand extends CLICommand {
     @Override
     protected int run() throws Exception {
         boolean errorOccurred = false;
-        final Jenkins jenkins = Jenkins.getInstance();
-        final HashSet<String> hs = new HashSet<String>(nodes);
+        final Jenkins jenkins = Jenkins.get();
+        final HashSet<String> hs = new HashSet<>(nodes);
         List<String> names = null;
 
         for (String node_s : hs) {
diff --git a/core/src/main/java/hudson/cli/OnlineNodeCommand.java b/core/src/main/java/hudson/cli/OnlineNodeCommand.java
index 5cb190fcd8ccf6bdb2c7f4e3e4c7e55888ad6505..0594d3770c9702a954f732d611dce90283ddfb87 100644
--- a/core/src/main/java/hudson/cli/OnlineNodeCommand.java
+++ b/core/src/main/java/hudson/cli/OnlineNodeCommand.java
@@ -56,7 +56,7 @@ public class OnlineNodeCommand extends CLICommand {
     protected int run() throws Exception {
         boolean errorOccurred = false;
         final Jenkins jenkins = Jenkins.getActiveInstance();
-        final HashSet<String> hs = new HashSet<String>(nodes);
+        final HashSet<String> hs = new HashSet<>(nodes);
         List<String> names = null;
 
         for (String node_s : hs) {
diff --git a/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java b/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java
index adb61e12c6d2fc17d32415acff65262dd9042553..6b29dcf52904c09ff60c91ab014b395caeb8ab83 100644
--- a/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java
+++ b/core/src/main/java/hudson/cli/ReloadConfigurationCommand.java
@@ -46,7 +46,7 @@ public class ReloadConfigurationCommand extends CLICommand {
 
     @Override
     protected int run() throws Exception {
-        Jenkins j = Jenkins.getInstance();
+        Jenkins j = Jenkins.get();
         // Or perhaps simpler to inline the thread body of doReload?
         j.doReload();
         Object app;
diff --git a/core/src/main/java/hudson/cli/ReloadJobCommand.java b/core/src/main/java/hudson/cli/ReloadJobCommand.java
index c8849a317f4832ef5c8411f8fc3d29fffe3217ff..3e42d64e68660dc69d4075bbac82cceb638b1201 100644
--- a/core/src/main/java/hudson/cli/ReloadJobCommand.java
+++ b/core/src/main/java/hudson/cli/ReloadJobCommand.java
@@ -26,11 +26,9 @@ package hudson.cli;
 import hudson.AbortException;
 import hudson.Extension;
 import hudson.model.AbstractItem;
-import hudson.model.AbstractProject;
 import hudson.model.Item;
 
 import hudson.model.Items;
-import hudson.model.TopLevelItem;
 import jenkins.model.Jenkins;
 import org.kohsuke.args4j.Argument;
 
@@ -64,7 +62,7 @@ public class ReloadJobCommand extends CLICommand {
         boolean errorOccurred = false;
         final Jenkins jenkins = Jenkins.getActiveInstance();
 
-        final HashSet<String> hs = new HashSet<String>();
+        final HashSet<String> hs = new HashSet<>();
         hs.addAll(jobs);
 
         for (String job_s: hs) {
diff --git a/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java b/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java
index 786f33d21e1ee5fc1cb0d68cec7bcb8605816d40..5a543c91c53a399d398ed43f0cf8dfe92e9105b4 100644
--- a/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java
+++ b/core/src/main/java/hudson/cli/RemoveJobFromViewCommand.java
@@ -31,7 +31,6 @@ import hudson.model.DirectlyModifiableView;
 import hudson.model.View;
 
 import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.CmdLineException;
 
 /**
  * @author ogondza
diff --git a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
index 5868d62b9ad68a8f31a7980496a638b0ef611472..e0dccb1553daef04c119b53f26526da553ee8031 100644
--- a/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
+++ b/core/src/main/java/hudson/cli/declarative/CLIRegisterer.java
@@ -47,6 +47,7 @@ import org.kohsuke.args4j.ClassParser;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.CmdLineException;
 
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -90,7 +91,7 @@ public class CLIRegisterer extends ExtensionFinder {
      * Finds a resolved method annotated with {@link CLIResolver}.
      */
     private Method findResolver(Class type) throws IOException {
-        List<Method> resolvers = Util.filter(Index.list(CLIResolver.class, Jenkins.getInstance().getPluginManager().uberClassLoader), Method.class);
+        List<Method> resolvers = Util.filter(Index.list(CLIResolver.class, Jenkins.get().getPluginManager().uberClassLoader), Method.class);
         for ( ; type!=null; type=type.getSuperclass())
             for (Method m : resolvers)
                 if (m.getReturnType()==type)
@@ -98,12 +99,12 @@ public class CLIRegisterer extends ExtensionFinder {
         return null;
     }
 
-    private List<ExtensionComponent<CLICommand>> discover(final Jenkins hudson) {
+    private List<ExtensionComponent<CLICommand>> discover(@Nonnull final Jenkins jenkins) {
         LOGGER.fine("Listing up @CLIMethod");
-        List<ExtensionComponent<CLICommand>> r = new ArrayList<ExtensionComponent<CLICommand>>();
+        List<ExtensionComponent<CLICommand>> r = new ArrayList<>();
 
         try {
-            for ( final Method m : Util.filter(Index.list(CLIMethod.class, hudson.getPluginManager().uberClassLoader),Method.class)) {
+            for ( final Method m : Util.filter(Index.list(CLIMethod.class, jenkins.getPluginManager().uberClassLoader),Method.class)) {
                 try {
                     // command name
                     final String name = m.getAnnotation(CLIMethod.class).name();
@@ -111,7 +112,7 @@ public class CLIRegisterer extends ExtensionFinder {
                     final ResourceBundleHolder res = loadMessageBundle(m);
                     res.format("CLI."+name+".shortDescription");   // make sure we have the resource, to fail early
 
-                    r.add(new ExtensionComponent<CLICommand>(new CloneableCLICommand() {
+                    r.add(new ExtensionComponent<>(new CloneableCLICommand() {
                         @Override
                         public String getName() {
                             return name;
@@ -120,12 +121,12 @@ public class CLIRegisterer extends ExtensionFinder {
                         @Override
                         public String getShortDescription() {
                             // format by using the right locale
-                            return res.format("CLI."+name+".shortDescription");
+                            return res.format("CLI." + name + ".shortDescription");
                         }
 
                         @Override
                         protected CmdLineParser getCmdLineParser() {
-                            return bindMethod(new ArrayList<MethodBinder>());
+                            return bindMethod(new ArrayList<>());
                         }
 
                         private CmdLineParser bindMethod(List<MethodBinder> binders) {
@@ -134,7 +135,7 @@ public class CLIRegisterer extends ExtensionFinder {
                             CmdLineParser parser = new CmdLineParser(null);
 
                             //  build up the call sequence
-                            Stack<Method> chains = new Stack<Method>();
+                            Stack<Method> chains = new Stack<>();
                             Method method = m;
                             while (true) {
                                 chains.push(method);
@@ -146,15 +147,15 @@ public class CLIRegisterer extends ExtensionFinder {
                                 try {
                                     method = findResolver(type);
                                 } catch (IOException ex) {
-                                    throw new RuntimeException("Unable to find the resolver method annotated with @CLIResolver for "+type, ex);
+                                    throw new RuntimeException("Unable to find the resolver method annotated with @CLIResolver for " + type, ex);
                                 }
-                                if (method==null) {
-                                    throw new RuntimeException("Unable to find the resolver method annotated with @CLIResolver for "+type);
+                                if (method == null) {
+                                    throw new RuntimeException("Unable to find the resolver method annotated with @CLIResolver for " + type);
                                 }
                             }
 
                             while (!chains.isEmpty())
-                                binders.add(new MethodBinder(chains.pop(),this,parser));
+                                binders.add(new MethodBinder(chains.pop(), this, parser));
 
                             return parser;
                         }
@@ -199,7 +200,7 @@ public class CLIRegisterer extends ExtensionFinder {
                             this.stderr = stderr;
                             this.locale = locale;
 
-                            List<MethodBinder> binders = new ArrayList<MethodBinder>();
+                            List<MethodBinder> binders = new ArrayList<>();
 
                             CmdLineParser parser = bindMethod(binders);
                             try {
@@ -207,7 +208,7 @@ public class CLIRegisterer extends ExtensionFinder {
                                 Authentication old = sc.getAuthentication();
                                 try {
                                     // authentication
-                                    CliAuthenticator authenticator = Jenkins.getInstance().getSecurityRealm().createCliAuthenticator(this);
+                                    CliAuthenticator authenticator = Jenkins.get().getSecurityRealm().createCliAuthenticator(this);
                                     new ClassParser().parse(authenticator, parser);
 
                                     // fill up all the binders
@@ -217,7 +218,7 @@ public class CLIRegisterer extends ExtensionFinder {
                                     if (auth == Jenkins.ANONYMOUS)
                                         auth = loadStoredAuthentication();
                                     sc.setAuthentication(auth); // run the CLI with the right credential
-                                    hudson.checkPermission(Jenkins.READ);
+                                    jenkins.checkPermission(Jenkins.READ);
 
                                     // resolve them
                                     Object instance = null;
diff --git a/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java b/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java
index 0648f057a04b28ab7aff06b283e6159b36a93054..5bd9834b485b625ffd089f50f6ff9dee64105c65 100644
--- a/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java
+++ b/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java
@@ -57,7 +57,7 @@ public abstract class GenericItemOptionHandler<T extends Item> extends OptionHan
     protected abstract Class<T> type();
 
     @Override public int parseArguments(Parameters params) throws CmdLineException {
-        final Jenkins j = Jenkins.getInstance();
+        final Jenkins j = Jenkins.get();
         final String src = params.getParameter(0);
         T s = j.getItemByFullName(src, type());
         if (s == null) {
diff --git a/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java b/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java
index 90905d5348968191b2d75e61ceeb01b3ca670b5f..a90199e8c1185630b152e35ddc5153dc1cd19d42 100644
--- a/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java
+++ b/core/src/main/java/hudson/cli/handlers/NodeOptionHandler.java
@@ -53,7 +53,7 @@ public class NodeOptionHandler extends OptionHandler<Node> {
 
         String nodeName = params.getParameter(0);
 
-        final Node node = Jenkins.getInstance().getNode(nodeName);
+        final Node node = Jenkins.get().getNode(nodeName);
         if (node == null) throw new IllegalArgumentException("No such node '" + nodeName + "'");
 
         setter.addValue(node);