diff --git a/README.md b/README.md
index 7f7362d..6436613 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,9 @@ Does bulk insertion of documents in a collection using Spring Data Framework for
 
 Connects to a replica set and bulk inserts a number of random documents. Uses the application.properties to configure connection.
 
-
 - Uses properties file to point to the MongoURI
-- Makes use of certificates for the TrustStore.
 - Documents are sent to the products collection in a user defined database.
 
-
 This sample application is provided to demonstrate integration capability. Users
 should review this code for component versioning and overall applicability for
 their own use case. 
diff --git a/src/main/java/com/mongodb/examples/springdatabulkinsert/CustomProductsRepository.java b/src/main/java/com/mongodb/examples/springdatabulkinsert/CustomProductsRepository.java
deleted file mode 100644
index bc92eed..0000000
--- a/src/main/java/com/mongodb/examples/springdatabulkinsert/CustomProductsRepository.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.mongodb.examples.springdatabulkinsert;
-
-public interface CustomProductsRepository {
-    void updateProductQuantity(String name, int newQty)  ;
-    int bulkInsertProducts(int count);
-}
diff --git a/src/main/java/com/mongodb/examples/springdatabulkinsert/MongoConfig.java b/src/main/java/com/mongodb/examples/springdatabulkinsert/MongoConfig.java
index 6a26171..e7bc4df 100644
--- a/src/main/java/com/mongodb/examples/springdatabulkinsert/MongoConfig.java
+++ b/src/main/java/com/mongodb/examples/springdatabulkinsert/MongoConfig.java
@@ -9,10 +9,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.MongoTemplate;
 
-import javax.net.ssl.SSLContext;
-import java.nio.file.Paths;
-import nl.altindag.ssl.SSLFactory;
-
 @Configuration
 public class MongoConfig   {
     @Value("${mongodb.uri}")
@@ -20,14 +16,6 @@ public class MongoConfig   {
     @Value("${mongodb.database}")
     private String databaseName;
 
-    @Value("${truststore.path}")
-    private String trustStorePath;
-    @Value("${truststore.pwd}")
-    private String trustStorePwd;
-
-    @Value("${mongodb.atlas}")
-    private boolean atlas;
-
     @Bean
     public MongoClient mongo() {
 
@@ -35,23 +23,8 @@ public MongoClient mongo() {
 
             MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
                     .applyConnectionString(connectionString)
-                    .applyToSslSettings(builder -> {
-                        if (!atlas) {
-                            // Use SSLContext if a trustStore has been provided
-                            if (!trustStorePath.isEmpty()) {
-                                SSLFactory sslFactory = SSLFactory.builder()
-                                        .withTrustMaterial(Paths.get(trustStorePath), trustStorePwd.toCharArray())
-                                        .build();
-                                SSLContext sslContext = sslFactory.getSslContext();
-                                builder.context(sslContext);
-                                builder.invalidHostNameAllowed(true);
-                            }
-                        }
-                        builder.enabled(true);
-                    })
                     .build();
 
-
         return MongoClients.create(mongoClientSettings);
     }
 
diff --git a/src/main/java/com/mongodb/examples/springdatabulkinsert/Products.java b/src/main/java/com/mongodb/examples/springdatabulkinsert/Product.java
similarity index 85%
rename from src/main/java/com/mongodb/examples/springdatabulkinsert/Products.java
rename to src/main/java/com/mongodb/examples/springdatabulkinsert/Product.java
index 2d968e3..bcf6db5 100644
--- a/src/main/java/com/mongodb/examples/springdatabulkinsert/Products.java
+++ b/src/main/java/com/mongodb/examples/springdatabulkinsert/Product.java
@@ -11,10 +11,10 @@
 
 
 @Document("products")
-public class Products {
+public class Product {
 
     private static final Logger LOG = LoggerFactory
-            .getLogger(Products.class);
+            .getLogger(Product.class);
 
     @Id
     private String id;
@@ -25,7 +25,7 @@ public class Products {
     private Date  unavailable;
     private String skuId;
 
-    public Products(String name, int qty, double price, Date available, Date unavailable, String skuId) {
+    public Product(String name, int qty, double price, Date available, Date unavailable, String skuId) {
         this.name = name;
         this.qty = qty;
         this.price = price;
@@ -34,15 +34,15 @@ public Products(String name, int qty, double price, Date available, Date unavail
         this.skuId = skuId;
     }
 
-    public static Products [] RandomProducts( int  count) {
+    public static Product [] RandomProducts( int  count) {
 
         Faker faker = new Faker();
         Random rand = new Random();
 
-        Products [] retProds = new Products[count];
+        Product [] retProds = new Product[count];
         for (int i=0; i<count; ++i) {
 
-            Products p = new Products(  faker.animal().name(),
+            Product p = new Product(  faker.animal().name(),
                     1+rand.nextInt(998),
                     10.0+rand.nextInt(9999),
                     new Date(), new Date(),
diff --git a/src/main/java/com/mongodb/examples/springdatabulkinsert/CustomProductsRepositoryImpl.java b/src/main/java/com/mongodb/examples/springdatabulkinsert/ProductRepository.java
similarity index 83%
rename from src/main/java/com/mongodb/examples/springdatabulkinsert/CustomProductsRepositoryImpl.java
rename to src/main/java/com/mongodb/examples/springdatabulkinsert/ProductRepository.java
index 6a7e04c..e4bf47f 100644
--- a/src/main/java/com/mongodb/examples/springdatabulkinsert/CustomProductsRepositoryImpl.java
+++ b/src/main/java/com/mongodb/examples/springdatabulkinsert/ProductRepository.java
@@ -16,27 +16,25 @@
 import java.time.Duration;
 import java.time.Instant;
 
-
 @Component
-public class CustomProductsRepositoryImpl implements CustomProductsRepository {
+public class ProductRepository {
 
     private static final Logger LOG = LoggerFactory
-            .getLogger(CustomProductsRepository.class);
+            .getLogger(ProductRepository.class);
 
     private final MongoTemplate mongoTemplate;
 
     @Autowired
-    public CustomProductsRepositoryImpl(MongoTemplate mongoTemplate){
+    public ProductRepository(MongoTemplate mongoTemplate){
         this.mongoTemplate = mongoTemplate;
     }
 
-
     public void updateProductQuantity(String name, int newQuantity) {
         Query query = new Query(Criteria.where("name").is(name));
         Update update = new Update();
         update.set("quantity", newQuantity);
 
-        UpdateResult result = mongoTemplate.updateFirst(query, update, Products.class);
+        UpdateResult result = mongoTemplate.updateFirst(query, update, Product.class);
 
         if(result == null)
             LOG.error("No documents updated");
@@ -47,14 +45,14 @@ public void updateProductQuantity(String name, int newQuantity) {
     public int bulkInsertProducts(int count) {
 
         LOG.info("Dropping collection...");
-        mongoTemplate.dropCollection(Products.class);
+        mongoTemplate.dropCollection(Product.class);
         LOG.info("Dropped!");
 
         Instant start = Instant.now();
         mongoTemplate.setWriteConcern(WriteConcern.W1.withJournal(true));
 
-        Products [] productList = Products.RandomProducts(count);
-        BulkOperations bulkInsertion = mongoTemplate.bulkOps(BulkOperations.BulkMode.UNORDERED, Products.class);
+        Product [] productList = Product.RandomProducts(count);
+        BulkOperations bulkInsertion = mongoTemplate.bulkOps(BulkOperations.BulkMode.UNORDERED, Product.class);
 
         for (int i=0; i<productList.length; ++i)
             bulkInsertion.insert(productList[i]);
@@ -64,4 +62,4 @@ public int bulkInsertProducts(int count) {
         LOG.info("Bulk insert of "+bulkWriteResult.getInsertedCount()+" documents completed in "+ Duration.between(start, Instant.now()).toMillis() + " milliseconds");
         return bulkWriteResult.getInsertedCount();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/mongodb/examples/springdatabulkinsert/SpringDataBulkInsertApplication.java b/src/main/java/com/mongodb/examples/springdatabulkinsert/SpringDataBulkInsertApplication.java
index 58346b5..7547d2b 100644
--- a/src/main/java/com/mongodb/examples/springdatabulkinsert/SpringDataBulkInsertApplication.java
+++ b/src/main/java/com/mongodb/examples/springdatabulkinsert/SpringDataBulkInsertApplication.java
@@ -17,18 +17,17 @@ public class SpringDataBulkInsertApplication implements CommandLineRunner {
             .getLogger(SpringDataBulkInsertApplication.class);
 
     @Autowired
-    private CustomProductsRepository repository;
+    private ProductRepository repository;
 
     public static void main(String[] args) {
         SpringApplication.run(SpringDataBulkInsertApplication.class, args);
     }
 
-
     @Override
     public void run(String... args) throws Exception {
 
         repository.bulkInsertProducts(count);
         LOG.info("End run");
-        System.exit(1);
+        System.exit(0);
     }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 3fd734d..96ef776 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,9 +2,5 @@
 mongodb.database=bulk
 
 mongodb.uri=<connection string>
-mongodb.atlas=1
-
-truststore.path=/etc/ssl/truststore.jks
-truststore.pwd=P4ssw0rd
 
 documentCount=25000