diff --git a/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java
index ffea384..aac9cf0 100644
--- a/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java
+++ b/Minepacks-API-Extended/src/at/pcgamingfreaks/Minepacks/Bukkit/ExtendedAPI/MinepacksPluginExtended.java
@@ -19,7 +19,7 @@
 
 import at.pcgamingfreaks.Minepacks.Bukkit.API.MinepacksPlugin;
 
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 public interface MinepacksPluginExtended extends MinepacksPlugin
 {
@@ -28,5 +28,5 @@ public interface MinepacksPluginExtended extends MinepacksPlugin
 	 *
 	 * @return The command manager instance. null if the plugin is running in standalone mode
 	 */
-	@Nullable MinepacksCommandManager getCommandManager();
+	@NotNull MinepacksCommandManager getCommandManager();
 }
\ No newline at end of file
diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java
index 720236d..ef228a4 100644
--- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java
+++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/CommandManager.java
@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.Locale;
 
-public class CommandManager extends CommandExecutorWithSubCommandsGeneric<MinepacksCommand> /*if_not[STANDALONE]*/ implements MinepacksCommandManager /*end[STANDALONE]*/
+public class CommandManager extends CommandExecutorWithSubCommandsGeneric<MinepacksCommand> implements MinepacksCommandManager
 {
 	private final Minepacks plugin;
 	private final RegisterablePluginCommand backpackCommand;
@@ -53,7 +53,7 @@ public CommandManager(@NotNull Minepacks plugin)
 		backpackCommand.setExecutor(this);
 		backpackCommand.setTabCompleter(this);
 
-		helpFormat = plugin.getLanguage().getMessage("Commands.HelpFormat").replaceAll("\\{MainCommand\\}", "%1\\$s").replaceAll("\\{SubCommand\\}", "%2\\$s").replaceAll("\\{Parameters\\}", "%3\\$s").replaceAll("\\{Description\\}", "%4\\$s").replaceAll("suggest_command", "%5\\$s");
+		helpFormat = plugin.getLanguage().getMessage("Commands.HelpFormat").replaceAll("\\{MainCommand}", "%1\\$s").replaceAll("\\{SubCommand}", "%2\\$s").replaceAll("\\{Parameters}", "%3\\$s").replaceAll("\\{Description}", "%4\\$s").replaceAll("suggest_command", "%5\\$s");
 
 		// Setting the help format for the marry commands as well as the no permissions and not from console message
 		try
diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
index 48fd566..18c487d 100644
--- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
+++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
@@ -345,13 +345,9 @@ public void getBackpack(final @NotNull OfflinePlayer owner, final @NotNull Callb
 	}
 
 	@Override
-	public MinepacksCommandManager getCommandManager()
+	public @NotNull MinepacksCommandManager getCommandManager()
 	{
-		/*if[STANDALONE]
-		return null;
-		else[STANDALONE]*/
 		return commandManager;
-		/*end[STANDALONE]*/
 	}
 
 	public int getBackpackPermSize(final @NotNull Player player)