diff --git a/pom.xml b/pom.xml
index d5cd6332..226ddf26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,9 +86,7 @@
         <build/> <!-- default value for jenkins build number -->
 
         <!-- Changeable variables  -->
-        <outputDir>target/output-files
-        </outputDir> <!-- Set to relative directory output of PreShade and JavaDoc files  -->
-
+        <outputDir>target</outputDir>
     </properties>
 
     <profiles>
@@ -146,6 +144,8 @@
         <defaultGoal>${doClean} install</defaultGoal>
         <finalName>${project.name}-${project.version}${branch}${commit}${fileTimeStamp}${build}</finalName>
 
+        <directory>${outputDir}/PreShade/</directory>
+
         <sourceDirectory>src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -168,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.12.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -181,15 +181,14 @@
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <outputDirectory>${outputDir}/shade</outputDirectory>
-                    <outputFile>target/server/plugins/${build.finalName}.jar
-                    </outputFile>
+                    <outputFile>${outputDir}/server/plugins/${project.build.finalName}.jar</outputFile>
                     <artifactSet>
                         <includes>
                             <include>org.bstats:*</include>
                             <include>de.themoep:*</include>
                             <include>com.bergerkiller.bukkit:*</include>
                             <include>com.github.simplix-softworks:*</include>
+                            <include>de.leonhart:*</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -206,13 +205,14 @@
                         <filter>
                             <artifact>*:*</artifact>
                             <excludes>
-                                <exclude>META-INF/maven/**</exclude>
+                                <exclude>META-INF/**</exclude>
                             </excludes>
                         </filter>
                     </filters>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>shade</id>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
@@ -220,6 +220,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <fileSets>
+                        <fileSet>
+                            <sourceFile>${outputDir}/server/plugins/${project.build.finalName}.jar</sourceFile>
+                            <destinationFile>${outputDir}/${project.build.finalName}.jar</destinationFile>
+                        </fileSet>
+                    </fileSets>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -227,7 +249,7 @@
                 <configuration>
                     <name>${project.build.finalName}</name>
                     <failOnError>false</failOnError>
-                    <jarOutputDirectory>${outputDir}/JavaDocs</jarOutputDirectory>
+                    <jarOutputDirectory>${outputDir}</jarOutputDirectory>
                     <!--suppress UnresolvedMavenProperty -->
                     <skip>${skipDocs}</skip>
                     <sourceFileExcludes>
@@ -287,7 +309,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.21.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -334,7 +356,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.26</version>
+            <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/src/main/java/org/shanerx/tradeshop/TradeShop.java b/src/main/java/org/shanerx/tradeshop/TradeShop.java
index 4beb77ec..bc9d4e6c 100644
--- a/src/main/java/org/shanerx/tradeshop/TradeShop.java
+++ b/src/main/java/org/shanerx/tradeshop/TradeShop.java
@@ -140,12 +140,6 @@ private boolean loadChecks() {
         getSettingManager().reload();
         getMessageManager().reload();
 
-        String lockout = "§a§3§c§2§f§6";
-        if (Setting.MESSAGE_PREFIX.getString().startsWith(lockout)) { //TODO remove for release if old data will not be lost
-            getLogger().log(Level.SEVERE, "This version will most likely break existing data. To continue, please add `" + lockout + "` before the message prefix in the config and restart the server.");
-            return false;
-        }
-
         return getVarManager().getDataStorage() != null;
     }
 
diff --git a/src/main/java/org/shanerx/tradeshop/data/storage/DataStorage.java b/src/main/java/org/shanerx/tradeshop/data/storage/DataStorage.java
index 50441db1..bfb5cb9f 100644
--- a/src/main/java/org/shanerx/tradeshop/data/storage/DataStorage.java
+++ b/src/main/java/org/shanerx/tradeshop/data/storage/DataStorage.java
@@ -318,10 +318,12 @@ protected LinkageConfiguration getLinkageData(World w) {
 
     public void ensureFinalSave() {
         // for onDisable !!!
+        /* WILL BE ADDED BACK IN LATER
         if (dataType == DataType.FLATFILE) {
             JsonShopData.SaveThreadMaster.getInstance().saveEverythingNow();
         }
         // SQLITE will have an analogous branch
+        */
     }
 }
 
diff --git a/src/main/java/org/shanerx/tradeshop/data/storage/Json/JsonShopData.java b/src/main/java/org/shanerx/tradeshop/data/storage/Json/JsonShopData.java
index d13fb883..4419ec12 100644
--- a/src/main/java/org/shanerx/tradeshop/data/storage/Json/JsonShopData.java
+++ b/src/main/java/org/shanerx/tradeshop/data/storage/Json/JsonShopData.java
@@ -29,7 +29,6 @@
 import org.bukkit.scheduler.BukkitRunnable;
 import org.jetbrains.annotations.NotNull;
 import org.shanerx.tradeshop.TradeShop;
-import org.shanerx.tradeshop.data.config.Setting;
 import org.shanerx.tradeshop.data.storage.ShopConfiguration;
 import org.shanerx.tradeshop.shop.Shop;
 import org.shanerx.tradeshop.shoplocation.ShopChunk;
@@ -45,6 +44,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
+import org.shanerx.tradeshop.data.config.Setting;
 
 public class JsonShopData extends JsonConfiguration implements ShopConfiguration {
 
@@ -105,7 +105,23 @@ public int size() {
 
     @Override
     protected void saveFile() {
-        SaveThreadMaster.getInstance().enqueue(this);
+        if (super.keySet().isEmpty()) {
+            super.file.delete();
+        } else {
+            super.saveFile();
+        }
+        
+        /*
+        //SaveThreadMaster.getInstance().enqueue(this);
+    
+        File file = op.jsonConfig.getFile();
+        if (op.jsonConfig.keySet().isEmpty()) {
+            file.delete();
+        } else {
+            op.jsonConfig.saveFile();
+        }
+        */
+        
     }
 
     @Override
@@ -131,6 +147,7 @@ protected void loadFile() {
         }
     }
 
+    /*
     public static class SaveOperation implements Comparable<SaveOperation> {
       
         @Getter
@@ -259,4 +276,5 @@ public int hashCode() {
             return master.maxThreads == 0 ? 0 : super.getTaskId();
         }
     }
+*/
 }