diff --git a/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java b/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
index cbe00b252a4..08f8ba4cfe6 100644
--- a/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
+++ b/src/main/java/org/elasticsearch/bootstrap/ESPolicy.java
@@ -29,7 +29,7 @@ import java.security.ProtectionDomain;
 import java.security.URIParameter;
 
 /** custom policy for union of static and dynamic permissions */
-public class ESPolicy extends Policy {
+final class ESPolicy extends Policy {
     
     /** template policy file, the one used in tests */
     static final String POLICY_RESOURCE = "security.policy";
diff --git a/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java b/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
index dddc137b26d..32ccd1525b7 100644
--- a/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
+++ b/src/main/java/org/elasticsearch/bootstrap/JVMCheck.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /** Checks that the JVM is ok and won't cause index corruption */
-public class JVMCheck {
+final class JVMCheck {
     
     /**
      * URL with latest JVM recommendations
@@ -43,7 +43,7 @@ public class JVMCheck {
     /**
      * Metadata and messaging for hotspot bugs.
      */
-    static class HotspotBug {
+    static final class HotspotBug {
         
         /** OpenJDK bug URL */
         final String bugUrl;
@@ -131,9 +131,4 @@ public class JVMCheck {
             throw new RuntimeException(sb.toString());
         }
     }
-    
-    /** Command line driver for convenience */
-    public static void main(String args[]) {
-        check();
-    }
 }
diff --git a/src/main/java/org/elasticsearch/bootstrap/Security.java b/src/main/java/org/elasticsearch/bootstrap/Security.java
index 3c3777c9206..eaaa50d438b 100644
--- a/src/main/java/org/elasticsearch/bootstrap/Security.java
+++ b/src/main/java/org/elasticsearch/bootstrap/Security.java
@@ -37,7 +37,7 @@ import java.security.Policy;
  * We use a template file (the one we test with), and add additional 
  * permissions based on the environment (data paths, etc)
  */
-class Security {
+final class Security {
        
     /** 
      * Initializes securitymanager for the environment