diff --git a/src/Umbraco.Core/Models/Rdbms/MacroDto.cs b/src/Umbraco.Core/Models/Rdbms/MacroDto.cs
index 6409f46294..855b4d1f93 100644
--- a/src/Umbraco.Core/Models/Rdbms/MacroDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/MacroDto.cs
@@ -22,6 +22,7 @@ namespace Umbraco.Core.Models.Rdbms
         public int RefreshRate { get; set; }
 
         [Column("macroAlias")]
+        [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsMacroPropertyAlias")]
         public string Alias { get; set; }
 
         [Column("macroName")]
diff --git a/src/Umbraco.Core/Services/IMacroService.cs b/src/Umbraco.Core/Services/IMacroService.cs
index 809f87dccf..ce406f8251 100644
--- a/src/Umbraco.Core/Services/IMacroService.cs
+++ b/src/Umbraco.Core/Services/IMacroService.cs
@@ -15,12 +15,12 @@ namespace Umbraco.Core.Services
         /// <returns>An <see cref="IMacro"/> object</returns>
         IMacro GetByAlias(string alias);
         
-        /// <summary>
-        /// Gets a list all available <see cref="IMacro"/> objects
-        /// </summary>
-        /// <param name="aliases">Optional array of aliases to limit the results</param>
-        /// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
-        IEnumerable<IMacro> GetAll(params string[] aliases);
+        ///// <summary>
+        ///// Gets a list all available <see cref="IMacro"/> objects
+        ///// </summary>
+        ///// <param name="aliases">Optional array of aliases to limit the results</param>
+        ///// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
+        //IEnumerable<IMacro> GetAll(params string[] aliases);
 
         IEnumerable<IMacro> GetAll(params int[] ids);
 
diff --git a/src/Umbraco.Core/Services/MacroService.cs b/src/Umbraco.Core/Services/MacroService.cs
index 837e0d31de..f8a2466b96 100644
--- a/src/Umbraco.Core/Services/MacroService.cs
+++ b/src/Umbraco.Core/Services/MacroService.cs
@@ -51,23 +51,23 @@ namespace Umbraco.Core.Services
             }
         }
 
-        /// <summary>
-        /// Gets a list all available <see cref="IMacro"/> objects
-        /// </summary>
-        /// <param name="aliases">Optional array of aliases to limit the results</param>
-        /// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
-        public IEnumerable<IMacro> GetAll(params string[] aliases)
-        {
-            using (var repository = _repositoryFactory.CreateMacroRepository(_uowProvider.GetUnitOfWork()))
-            {
-                if (aliases.Any())
-                {
-                    return GetAllByAliases(repository, aliases);
-                }
+        ///// <summary>
+        ///// Gets a list all available <see cref="IMacro"/> objects
+        ///// </summary>
+        ///// <param name="aliases">Optional array of aliases to limit the results</param>
+        ///// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
+        //public IEnumerable<IMacro> GetAll(params string[] aliases)
+        //{
+        //    using (var repository = _repositoryFactory.CreateMacroRepository(_uowProvider.GetUnitOfWork()))
+        //    {
+        //        if (aliases.Any())
+        //        {
+        //            return GetAllByAliases(repository, aliases);
+        //        }
 
-                return repository.GetAll();
-            }
-        }
+        //        return repository.GetAll();
+        //    }
+        //}
 
         public IEnumerable<IMacro> GetAll(params int[] ids)
         {
@@ -85,15 +85,15 @@ namespace Umbraco.Core.Services
             }
         }
 
-        private IEnumerable<IMacro> GetAllByAliases(IMacroRepository repo, IEnumerable<string> aliases)
-        {
-            foreach (var alias in aliases)
-            {
-                var q = new Query<IMacro>();
-                q.Where(macro => macro.Alias == alias);
-                yield return repo.GetByQuery(q).FirstOrDefault();
-            }
-        }
+        //private IEnumerable<IMacro> GetAllByAliases(IMacroRepository repo, IEnumerable<string> aliases)
+        //{
+        //    foreach (var alias in aliases)
+        //    {
+        //        var q = new Query<IMacro>();
+        //        q.Where(macro => macro.Alias == alias);
+        //        yield return repo.GetByQuery(q).FirstOrDefault();
+        //    }
+        //}
 
         /// <summary>
         /// Deletes an <see cref="IMacro"/>
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
index 8b3bba7b4a..73ce8f0c1e 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MacroRepositoryTest.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Act
             using (var repository = new MacroRepository(unitOfWork, NullCacheProvider.Current))
             {
-                var macro = new Macro("test", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
+                var macro = new Macro("test1", "Test", "~/usercontrol/blah.ascx", "MyAssembly", "test.xslt", "~/views/macropartials/test.cshtml");
                 repository.AddOrUpdate(macro);
 
                 Assert.Throws<SqlCeException>(unitOfWork.Commit);
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var repository = new MacroRepository(unitOfWork, NullCacheProvider.Current))
             {
                 var macro = repository.Get(1);
-                macro.Alias = "test1";
+                macro.Alias = "test2";
                 repository.AddOrUpdate(macro);
                 Assert.Throws<SqlCeException>(unitOfWork.Commit);
             }
diff --git a/src/Umbraco.Tests/Services/MacroServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs
index 44bf9a7583..308d7fa040 100644
--- a/src/Umbraco.Tests/Services/MacroServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs
@@ -63,18 +63,18 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(3, result.Count());
         }
 
-        [Test]
-        public void Can_Get_Many_By_Alias()
-        {
-            // Arrange
-            var macroService = ServiceContext.MacroService;
+        //[Test]
+        //public void Can_Get_Many_By_Alias()
+        //{
+        //    // Arrange
+        //    var macroService = ServiceContext.MacroService;
 
-            // Act
-            var result = macroService.GetAll("test1", "test2");
+        //    // Act
+        //    var result = macroService.GetAll("test1", "test2");
 
-            //assert
-            Assert.AreEqual(2, result.Count());
-        }
+        //    //assert
+        //    Assert.AreEqual(2, result.Count());
+        //}
 
     }
 }
\ No newline at end of file