diff --git a/DatabaseIntegrityCheck.sql b/DatabaseIntegrityCheck.sql
index f4f3e06..0388a49 100644
--- a/DatabaseIntegrityCheck.sql
+++ b/DatabaseIntegrityCheck.sql
@@ -192,8 +192,6 @@ BEGIN
     SET @HostPlatform = 'Windows'
   END
 
-  DECLARE @AmazonRDS bit = CASE WHEN DB_ID('rdsadmin') IS NOT NULL AND SUSER_SNAME(0x01) = 'rdsa' THEN 1 ELSE 0 END
-
   ----------------------------------------------------------------------------------------------------
   --// Log initial information                                                                    //--
   ----------------------------------------------------------------------------------------------------
diff --git a/IndexOptimize.sql b/IndexOptimize.sql
index 3410ce7..f67ecc1 100644
--- a/IndexOptimize.sql
+++ b/IndexOptimize.sql
@@ -100,7 +100,6 @@ BEGIN
   DECLARE @CurrentAvailabilityGroupRole nvarchar(max)
   DECLARE @CurrentDatabaseMirroringRole nvarchar(max)
 
-  DECLARE @CurrentDatabaseContext nvarchar(max)
   DECLARE @CurrentCommand nvarchar(max)
   DECLARE @CurrentCommandOutput int
   DECLARE @CurrentCommandType nvarchar(max)
@@ -271,8 +270,6 @@ BEGIN
     SET @HostPlatform = 'Windows'
   END
 
-  DECLARE @AmazonRDS bit = CASE WHEN DB_ID('rdsadmin') IS NOT NULL AND SUSER_SNAME(0x01) = 'rdsa' THEN 1 ELSE 0 END
-
   ----------------------------------------------------------------------------------------------------
   --// Log initial information                                                                    //--
   ----------------------------------------------------------------------------------------------------
@@ -2067,8 +2064,6 @@ BEGIN
 
         IF @CurrentIndexID IS NOT NULL AND @CurrentAction IS NOT NULL AND (SYSDATETIME() < DATEADD(SECOND,@TimeLimit,@StartTime) OR @TimeLimit IS NULL)
         BEGIN
-          SET @CurrentDatabaseContext = @CurrentDatabaseName
-
           SET @CurrentCommandType = 'ALTER_INDEX'
 
           SET @CurrentCommand = ''
@@ -2213,8 +2208,6 @@ BEGIN
 
         IF @CurrentStatisticsID IS NOT NULL AND @CurrentUpdateStatistics = 'Y' AND (SYSDATETIME() < DATEADD(SECOND,@TimeLimit,@StartTime) OR @TimeLimit IS NULL)
         BEGIN
-          SET @CurrentDatabaseContext = @CurrentDatabaseName
-
           SET @CurrentCommandType = 'UPDATE_STATISTICS'
 
           SET @CurrentCommand = ''
@@ -2299,8 +2292,6 @@ BEGIN
         AND ID = @CurrentIxID
 
         -- Clear variables
-        SET @CurrentDatabaseContext = NULL
-
         SET @CurrentCommand = NULL
         SET @CurrentCommandOutput = NULL
         SET @CurrentCommandType = NULL