diff --git a/LibGit2Sharp/BranchCollection.cs b/LibGit2Sharp/BranchCollection.cs
index 01fb0a011..8a91b1b36 100644
--- a/LibGit2Sharp/BranchCollection.cs
+++ b/LibGit2Sharp/BranchCollection.cs
@@ -124,19 +124,6 @@ public virtual Branch Add(string name, Commit commit, bool allowOverwrite = fals
             return this[ShortToLocalName(name)];
         }
 
-        /// <summary>
-        ///   Create a new local branch with the specified name
-        /// </summary>
-        /// <param name = "name">The name of the branch.</param>
-        /// <param name = "committish">Revparse spec for the target commit.</param>
-        /// <param name = "allowOverwrite">True to allow silent overwriting a potentially existing branch, false otherwise.</param>
-        /// <returns></returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Branch Create(string name, string committish, bool allowOverwrite = false)
-        {
-            return this.Add(name, committish, allowOverwrite);
-        }
-
         /// <summary>
         ///   Deletes the specified branch.
         /// </summary>
@@ -151,17 +138,6 @@ public virtual void Remove(Branch branch)
             }
         }
 
-        /// <summary>
-        ///   Deletes the branch with the specified name.
-        /// </summary>
-        /// <param name = "name">The name of the branch to delete.</param>
-        /// <param name = "isRemote">True if the provided <paramref name="name"/> is the name of a remote branch, false otherwise.</param>
-        [Obsolete("This method will be removed in the next release. Please use Remove() instead.")]
-        public virtual void Delete(string name, bool isRemote = false)
-        {
-            this.Remove(name, isRemote);
-        }
-
         /// <summary>
         ///   Renames an existing local branch with a new name.
         /// </summary>
diff --git a/LibGit2Sharp/Commit.cs b/LibGit2Sharp/Commit.cs
index 48226e691..2c12ae8f3 100644
--- a/LibGit2Sharp/Commit.cs
+++ b/LibGit2Sharp/Commit.cs
@@ -92,12 +92,6 @@ public virtual TreeEntry this[string relativePath]
         /// </summary>
         public virtual IEnumerable<Commit> Parents { get { return parents; } }
 
-        /// <summary>
-        ///   Gets The count of parent commits.
-        /// </summary>
-        [Obsolete("This property will be removed in the next release. Please use Parents.Count() instead.")]
-        public virtual int ParentsCount { get { return Parents.Count(); } }
-
         /// <summary>
         ///   Gets the notes of this commit.
         /// </summary>
diff --git a/LibGit2Sharp/CommitLog.cs b/LibGit2Sharp/CommitLog.cs
index 149b4b278..9618cd859 100644
--- a/LibGit2Sharp/CommitLog.cs
+++ b/LibGit2Sharp/CommitLog.cs
@@ -145,22 +145,6 @@ public virtual Commit FindCommonAncestor(IEnumerable<Commit> commits)
             return ret;
         }
 
-        /// <summary>
-        ///   Stores the content of the <see cref = "Repository.Index" /> as a new <see cref = "Commit" /> into the repository.
-        ///   The tip of the <see cref = "Repository.Head"/> will be used as the parent of this new Commit.
-        ///   Once the commit is created, the <see cref = "Repository.Head"/> will move forward to point at it.
-        /// </summary>
-        /// <param name = "message">The description of why a change was made to the repository.</param>
-        /// <param name = "author">The <see cref = "Signature" /> of who made the change.</param>
-        /// <param name = "committer">The <see cref = "Signature" /> of who added the change to the repository.</param>
-        /// <param name = "amendPreviousCommit">True to amend the current <see cref = "Commit"/> pointed at by <see cref = "Repository.Head"/>, false otherwise.</param>
-        /// <returns>The generated <see cref = "Commit" />.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Repository.Commit() instead.")]
-        public Commit Create(string message, Signature author, Signature committer, bool amendPreviousCommit)
-        {
-            return repo.Commit(message, author, committer, amendPreviousCommit);
-        }
-
         private class CommitEnumerator : IEnumerator<Commit>
         {
             private readonly Repository repo;
diff --git a/LibGit2Sharp/Configuration.cs b/LibGit2Sharp/Configuration.cs
index 04747d79e..eb2733901 100644
--- a/LibGit2Sharp/Configuration.cs
+++ b/LibGit2Sharp/Configuration.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Core.Handles;
@@ -13,7 +12,6 @@ namespace LibGit2Sharp
     ///   Provides access to configuration variables for a repository.
     /// </summary>
     public class Configuration : IDisposable,
-        IEnumerable<ConfigurationEntry>,
         IEnumerable<ConfigurationEntry<string>>
     {
         private readonly FilePath globalConfigPath;
@@ -85,24 +83,6 @@ public Configuration(string globalConfigurationFileLocation = null, string xdgCo
         {
         }
 
-        /// <summary>
-        ///   Determines if a Git configuration file specific to the current interactive user has been found.
-        /// </summary>
-        [Obsolete("This property will be removed in the next release. Please use HasConfig() instead.")]
-        public virtual bool HasGlobalConfig
-        {
-            get { return HasConfig(ConfigurationLevel.Global); }
-        }
-
-        /// <summary>
-        ///   Determines if a system-wide Git configuration file has been found.
-        /// </summary>
-        [Obsolete("This property will be removed in the next release. Please use HasConfig() instead.")]
-        public virtual bool HasSystemConfig
-        {
-            get { return HasConfig(ConfigurationLevel.System); }
-        }
-
         /// <summary>
         ///   Determines which configuration file has been found.
         /// </summary>
@@ -287,12 +267,6 @@ private static Action<string, object, ConfigurationSafeHandle> GetUpdater<T>(Act
         };
 
         IEnumerator<ConfigurationEntry<string>> IEnumerable<ConfigurationEntry<String>>.GetEnumerator()
-        {
-            return BuildConfigEntries().Cast<ConfigurationEntry<string>>().GetEnumerator();
-        }
-
-        [Obsolete("This method will be removed in the next release. Please use a different overload instead.")]
-        IEnumerator<ConfigurationEntry> IEnumerable<ConfigurationEntry>.GetEnumerator()
         {
             return BuildConfigEntries().GetEnumerator();
         }
@@ -302,15 +276,15 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
             return ((IEnumerable<ConfigurationEntry<string>>)this).GetEnumerator();
         }
 
-        private ICollection<ConfigurationEntry> BuildConfigEntries()
+        private IEnumerable<ConfigurationEntry<string>> BuildConfigEntries()
         {
             return Proxy.git_config_foreach(configHandle, entryPtr =>
             {
                 var entry = (GitConfigEntry)Marshal.PtrToStructure(entryPtr, typeof(GitConfigEntry));
 
-                return new ConfigurationEntry(Utf8Marshaler.FromNative(entry.namePtr),
-                                              Utf8Marshaler.FromNative(entry.valuePtr),
-                                              (ConfigurationLevel)entry.level);
+                return new ConfigurationEntry<string>(Utf8Marshaler.FromNative(entry.namePtr),
+                                                      Utf8Marshaler.FromNative(entry.valuePtr),
+                                                      (ConfigurationLevel)entry.level);
             });
         }
     }
diff --git a/LibGit2Sharp/ConfigurationEntry.cs b/LibGit2Sharp/ConfigurationEntry.cs
index 63ab9d2d9..129dcc6b7 100644
--- a/LibGit2Sharp/ConfigurationEntry.cs
+++ b/LibGit2Sharp/ConfigurationEntry.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Globalization;
 
 namespace LibGit2Sharp
@@ -54,26 +53,4 @@ private string DebuggerDisplay
             }
         }
     }
-
-    /// <summary>
-    /// Enumerated config option
-    /// </summary>
-    [Obsolete("This class will be removed in the next release. Please use ConfigurationEntry<T> instead.")]
-    public class ConfigurationEntry : ConfigurationEntry<string>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfigurationEntry{T}"/> class with a given key and value
-        /// </summary>
-        /// <param name="key">The option name</param>
-        /// <param name="value">The option value</param>
-        /// <param name="level">The origin store</param>
-        internal ConfigurationEntry(string key, string value, ConfigurationLevel level) : base(key, value, level)
-        { }
-
-        /// <summary>
-        ///   Needed for mocking purposes.
-        /// </summary>
-        protected ConfigurationEntry()
-        { }
-    }
 }
diff --git a/LibGit2Sharp/ConfigurationExtensions.cs b/LibGit2Sharp/ConfigurationExtensions.cs
index 43c3900fe..e9aed40a8 100644
--- a/LibGit2Sharp/ConfigurationExtensions.cs
+++ b/LibGit2Sharp/ConfigurationExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using LibGit2Sharp.Core;
 
 namespace LibGit2Sharp
@@ -8,149 +7,6 @@ namespace LibGit2Sharp
     /// </summary>
     public static class ConfigurationExtensions
     {
-        /// <summary>
-        ///   Delete a configuration variable (key and value).
-        /// </summary>
-        /// <param name = "config">The configuration being worked with.</param>
-        /// <param name = "key">The key to delete.</param>
-        /// <param name = "level">The configuration file which should be considered as the target of this operation</param>
-        [Obsolete("This method will be removed in the next release. Please use Unset() instead.")]
-        public static void Delete(this Configuration config, string key,
-                                  ConfigurationLevel level = ConfigurationLevel.Local)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(key, "key");
-
-            config.Unset(key, level);
-        }
-
-        /// <summary>
-        ///   Get a configuration value for a key. Keys are in the form 'section.name'.
-        ///   <para>
-        ///     For example in  order to get the value for this in a .git\config file:
-        ///
-        ///     <code>
-        ///     [core]
-        ///     bare = true
-        ///     </code>
-        ///
-        ///     You would call:
-        ///
-        ///     <code>
-        ///     bool isBare = repo.Config.Get&lt;bool&gt;("core.bare", false);
-        ///     </code>
-        ///   </para>
-        /// </summary>
-        /// <typeparam name = "T">The configuration value type</typeparam>
-        /// <param name = "config">The configuration being worked with.</param>
-        /// <param name = "key">The key</param>
-        /// <param name = "defaultValue">The default value</param>
-        /// <returns>The configuration value, or <c>defaultValue</c> if not set</returns>
-        [Obsolete("This method will be removed in the next release. Please use a different overload instead.")]
-        public static T Get<T>(this Configuration config, string key, T defaultValue)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(key, "key");
-
-            var val = config.Get<T>(key);
-
-            return val == null ? defaultValue : val.Value;
-        }
-
-        /// <summary>
-        ///   Get a configuration value for a key. Keys are in the form 'section.name'.
-        ///   <para>
-        ///     For example in  order to get the value for this in a .git\config file:
-        ///
-        ///     <code>
-        ///     [core]
-        ///     bare = true
-        ///     </code>
-        ///
-        ///     You would call:
-        ///
-        ///     <code>
-        ///     bool isBare = repo.Config.Get&lt;bool&gt;("core", "bare", false);
-        ///     </code>
-        ///   </para>
-        /// </summary>
-        /// <typeparam name = "T">The configuration value type</typeparam>
-        /// <param name = "config">The configuration being worked with.</param>
-        /// <param name = "firstKeyPart">The first key part</param>
-        /// <param name = "secondKeyPart">The second key part</param>
-        /// <param name = "defaultValue">The default value</param>
-        /// <returns>The configuration value, or <c>defaultValue</c> if not set</returns>
-        [Obsolete("This method will be removed in the next release. Please use a different overload instead.")]
-        public static T Get<T>(this Configuration config, string firstKeyPart, string secondKeyPart, T defaultValue)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(firstKeyPart, "firstKeyPart");
-            Ensure.ArgumentNotNullOrEmptyString(secondKeyPart, "secondKeyPart");
-
-            return config.Get(new[] { firstKeyPart, secondKeyPart }, defaultValue);
-        }
-
-        /// <summary>
-        ///   Get a configuration value for the given key parts.
-        ///   <para>
-        ///     For example in order to get the value for this in a .git\config file:
-        ///
-        ///     <code>
-        ///     [difftool "kdiff3"]
-        ///       path = c:/Program Files/KDiff3/kdiff3.exe
-        ///     </code>
-        ///
-        ///     You would call:
-        ///
-        ///     <code>
-        ///     string where = repo.Config.Get&lt;string&gt;("difftool", "kdiff3", "path", null);
-        ///     </code>
-        ///   </para>
-        /// </summary>
-        /// <typeparam name = "T">The configuration value type</typeparam>
-        /// <param name = "config">The configuration being worked with.</param>
-        /// <param name = "firstKeyPart">The first key part</param>
-        /// <param name = "secondKeyPart">The second key part</param>
-        /// <param name = "thirdKeyPart">The third key part</param>
-        /// <param name = "defaultValue">The default value</param>
-        /// <returns>The configuration value, or <c>defaultValue</c> if not set</returns>
-        [Obsolete("This method will be removed in the next release. Please use a different overload instead.")]
-        public static T Get<T>(this Configuration config, string firstKeyPart, string secondKeyPart, string thirdKeyPart, T defaultValue)
-        {
-            Ensure.ArgumentNotNullOrEmptyString(firstKeyPart, "firstKeyPart");
-            Ensure.ArgumentNotNullOrEmptyString(secondKeyPart, "secondKeyPart");
-            Ensure.ArgumentNotNullOrEmptyString(thirdKeyPart, "secondKeyPart");
-
-            return config.Get(new[] { firstKeyPart, secondKeyPart, thirdKeyPart }, defaultValue);
-        }
-
-        /// <summary>
-        ///   Get a configuration value for the given key parts.
-        ///   <para>
-        ///     For example in order to get the value for this in a .git\config file:
-        ///
-        ///     <code>
-        ///     [core]
-        ///     bare = true
-        ///     </code>
-        ///
-        ///     You would call:
-        ///
-        ///     <code>
-        ///     bool isBare = repo.Config.Get&lt;bool&gt;(new []{ "core", "bare" }, false);
-        ///     </code>
-        ///   </para>
-        /// </summary>
-        /// <typeparam name = "T">The configuration value type</typeparam>
-        /// <param name = "config">The configuration being worked with.</param>
-        /// <param name = "keyParts">The key parts</param>
-        /// <param name = "defaultValue">The default value</param>
-        /// <returns>The configuration value, or <c>defaultValue</c> if not set</returns>
-        [Obsolete("This method will be removed in the next release. Please use a different overload instead.")]
-        public static T Get<T>(this Configuration config, string[] keyParts, T defaultValue)
-        {
-            Ensure.ArgumentNotNull(keyParts, "keyParts");
-
-            return config.Get(string.Join(".", keyParts), defaultValue);
-        }
-
         /// <summary>
         ///   Get a configuration value for the given key parts.
         ///   <para>
diff --git a/LibGit2Sharp/Diff.cs b/LibGit2Sharp/Diff.cs
index 41806da4a..288cd1930 100644
--- a/LibGit2Sharp/Diff.cs
+++ b/LibGit2Sharp/Diff.cs
@@ -122,36 +122,6 @@ private static IDictionary<DiffTargets, Func<Repository, TreeComparisonHandleRet
                        };
         }
 
-        /// <summary>
-        ///   Show changes between a <see cref = "Tree"/> and a selectable target.
-        /// </summary>
-        /// <param name = "oldTree">The <see cref = "Tree"/> to compare from.</param>
-        /// <param name = "diffTarget">The target to compare to.</param>
-        /// <param name = "paths">The list of paths (either files or directories) that should be compared.</param>
-        /// <returns>A <see cref = "TreeChanges"/> containing the changes between the <see cref="Tree"/> and the selected target.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Compare(Tree, DiffTargets, IEnumerable<string>) instead.")]
-        public virtual TreeChanges Compare(Tree oldTree, DiffTarget diffTarget, IEnumerable<string> paths = null)
-        {
-            DiffTargets targets;
-
-            switch (diffTarget)
-            {
-                case DiffTarget.Index:
-                    targets = DiffTargets.Index;
-                    break;
-
-                case DiffTarget.WorkingDirectory:
-                    targets = DiffTargets.WorkingDirectory;
-                    break;
-
-                default:
-                    targets = DiffTargets.Index | DiffTargets.WorkingDirectory;
-                    break;
-            }
-
-            return Compare(oldTree, targets, paths);
-        }
-
         /// <summary>
         ///   Show changes between a <see cref = "Tree"/> and the Index, the Working Directory, or both.
         /// </summary>
diff --git a/LibGit2Sharp/DiffTarget.cs b/LibGit2Sharp/DiffTarget.cs
deleted file mode 100644
index e13911471..000000000
--- a/LibGit2Sharp/DiffTarget.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-
-namespace LibGit2Sharp
-{
-    /// <summary>
-    ///   The target of a Tree based diff comparison.
-    /// </summary>
-    [Obsolete("This type will be removed in the next release. Please use DiffTargets instead.")]
-    public enum DiffTarget
-    {
-        /// <summary>
-        ///   The working directory.
-        /// </summary>
-        WorkingDirectory,
-
-        /// <summary>
-        ///   The repository index.
-        /// </summary>
-        Index,
-
-        /// <summary>
-        ///   Both the working directory and the repository index.
-        /// </summary>
-        BothWorkingDirectoryAndIndex,
-    }
-}
diff --git a/LibGit2Sharp/ICommitLog.cs b/LibGit2Sharp/ICommitLog.cs
index 1f1b17bee..652e6832a 100644
--- a/LibGit2Sharp/ICommitLog.cs
+++ b/LibGit2Sharp/ICommitLog.cs
@@ -6,14 +6,7 @@ namespace LibGit2Sharp
     /// <summary>
     ///   A log of commits in a <see cref = "Repository" />.
     /// </summary>
-    public interface ICommitLog : ICommitCollection
-    { }
-
-    /// <summary>
-    ///   A collection of commits in a <see cref = "Repository" />.
-    /// </summary>
-    [Obsolete("This interface will be removed in the next release. Please use ICommitLog instead.")]
-    public interface ICommitCollection : IEnumerable<Commit>
+    public interface ICommitLog : IEnumerable<Commit>
     {
         /// <summary>
         ///   Gets the current sorting strategy applied when enumerating the log.
diff --git a/LibGit2Sharp/IQueryableCommitLog.cs b/LibGit2Sharp/IQueryableCommitLog.cs
index dd5519bc3..292a0c3f8 100644
--- a/LibGit2Sharp/IQueryableCommitLog.cs
+++ b/LibGit2Sharp/IQueryableCommitLog.cs
@@ -1,19 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace LibGit2Sharp
 {
     /// <summary>
     ///   A log of commits in a <see cref = "Repository" /> that can be filtered with queries.
     /// </summary>
-    public interface IQueryableCommitLog : ICommitLog, IQueryableCommitCollection
-    { }
-
-    /// <summary>
-    ///   A collection of commits in a <see cref = "Repository" /> that can be filtered with queries.
-    /// </summary>
-    [Obsolete("This interface will be removed in the next release. Please use IQueryableCommitLog instead.")]
-    public interface IQueryableCommitCollection : ICommitCollection
+    public interface IQueryableCommitLog : ICommitLog
     {
         /// <summary>
         ///   Returns the list of commits of the repository matching the specified <paramref name = "filter" />.
@@ -22,19 +14,6 @@ public interface IQueryableCommitCollection : ICommitCollection
         /// <returns>A list of commits, ready to be enumerated.</returns>
         ICommitLog QueryBy(Filter filter);
 
-        /// <summary>
-        ///   Stores the content of the <see cref = "Repository.Index" /> as a new <see cref = "Commit" /> into the repository.
-        ///   The tip of the <see cref = "Repository.Head"/> will be used as the parent of this new Commit.
-        ///   Once the commit is created, the <see cref = "Repository.Head"/> will move forward to point at it.
-        /// </summary>
-        /// <param name = "message">The description of why a change was made to the repository.</param>
-        /// <param name = "author">The <see cref = "Signature" /> of who made the change.</param>
-        /// <param name = "committer">The <see cref = "Signature" /> of who added the change to the repository.</param>
-        /// <param name = "amendPreviousCommit">True to amend the current <see cref = "Commit"/> pointed at by <see cref = "Repository.Head"/>, false otherwise.</param>
-        /// <returns>The generated <see cref = "Commit" />.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Repository.Commit() instead.")]
-        Commit Create(string message, Signature author, Signature committer, bool amendPreviousCommit);
-
         /// <summary>
         ///   Find the best possible common ancestor given two <see cref = "Commit"/>s.
         /// </summary>
diff --git a/LibGit2Sharp/IRepository.cs b/LibGit2Sharp/IRepository.cs
index b6650fb97..12f3f01aa 100644
--- a/LibGit2Sharp/IRepository.cs
+++ b/LibGit2Sharp/IRepository.cs
@@ -30,12 +30,6 @@ public interface IRepository : IDisposable
         /// </summary>
         ReferenceCollection Refs { get; }
 
-        /// <summary>
-        ///   Lookup and manage remotes in the repository.
-        /// </summary>
-        [Obsolete("This property will be removed in the next release. Please use Repository.Network.Remotes instead.")]
-        RemoteCollection Remotes { get; }
-
         /// <summary>
         ///   Lookup and enumerate commits in the repository.
         ///   Iterating this collection directly starts walking from the HEAD.
diff --git a/LibGit2Sharp/IndexEntry.cs b/LibGit2Sharp/IndexEntry.cs
index 01991dcd2..7a9c51bb8 100644
--- a/LibGit2Sharp/IndexEntry.cs
+++ b/LibGit2Sharp/IndexEntry.cs
@@ -15,18 +15,6 @@ public class IndexEntry : IEquatable<IndexEntry>
         private static readonly LambdaEqualityHelper<IndexEntry> equalityHelper =
             new LambdaEqualityHelper<IndexEntry>(x => x.Path, x => x.Id, x => x.Mode, x => x.StageLevel);
 
-        private Func<FileStatus> state;
-
-        /// <summary>
-        ///   State of the version of the <see cref = "Blob" /> pointed at by this <see cref = "IndexEntry" />,
-        ///   compared against the <see cref = "Blob" /> known from the <see cref = "Repository.Head" /> and the file in the working directory.
-        /// </summary>
-        [Obsolete("This method will be removed in the next release. Please use Repository.Index.RetrieveStatus(filePath) overload instead.")]
-        public virtual FileStatus State
-        {
-            get { return state(); }
-        }
-
         /// <summary>
         ///   Gets the relative path to the file within the working directory.
         /// </summary>
@@ -62,7 +50,6 @@ internal static IndexEntry BuildFromPtr(Repository repo, IndexEntrySafeHandle ha
                        {
                            Path = path.Native,
                            Id = entry.oid,
-                           state = () => repo.Index.RetrieveStatus(path.Native),
                            StageLevel = Proxy.git_index_entry_stage(handle),
                            Mode = (Mode)entry.Mode
                        };
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index f81c1ee55..653c4db4e 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -149,7 +149,6 @@
     <Compile Include="Core\Handles\TreeEntrySafeHandle.cs" />
     <Compile Include="DetachedHead.cs" />
     <Compile Include="Diff.cs" />
-    <Compile Include="DiffTarget.cs" />
     <Compile Include="IRepository.cs" />
     <Compile Include="NoteCollection.cs" />
     <Compile Include="Note.cs" />
diff --git a/LibGit2Sharp/LibGit2SharpException.cs b/LibGit2Sharp/LibGit2SharpException.cs
index c52553611..20b51e5f4 100644
--- a/LibGit2Sharp/LibGit2SharpException.cs
+++ b/LibGit2Sharp/LibGit2SharpException.cs
@@ -5,40 +5,6 @@
 
 namespace LibGit2Sharp
 {
-    /// <summary>
-    ///   The exception that is thrown when an error occurs during application execution.
-    /// </summary>
-    [Obsolete("This type will be removed in the next release. Please use LibGit2SharpException instead.")]
-    [Serializable]
-    public class LibGit2Exception : LibGit2SharpException
-    {
-        /// <summary>
-        ///   Initializes a new instance of the <see cref = "LibGit2Exception" /> class.
-        /// </summary>
-        public LibGit2Exception()
-        {
-        }
-
-        /// <summary>
-        ///   Initializes a new instance of the <see cref = "LibGit2Exception" /> class with a specified error message.
-        /// </summary>
-        /// <param name = "message">A message that describes the error. </param>
-        public LibGit2Exception(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        ///   Initializes a new instance of the <see cref = "LibGit2Exception" /> class with a specified error message and a reference to the inner exception that is the cause of this exception.
-        /// </summary>
-        /// <param name = "message">The error message that explains the reason for the exception. </param>
-        /// <param name = "innerException">The exception that is the cause of the current exception. If the <paramref name = "innerException" /> parameter is not a null reference, the current exception is raised in a catch block that handles the inner exception.</param>
-        public LibGit2Exception(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-    }
-
     /// <summary>
     ///   The exception that is thrown when an error occurs during application execution.
     /// </summary>
diff --git a/LibGit2Sharp/NoteCollection.cs b/LibGit2Sharp/NoteCollection.cs
index 5341f0595..8352b8836 100644
--- a/LibGit2Sharp/NoteCollection.cs
+++ b/LibGit2Sharp/NoteCollection.cs
@@ -184,21 +184,6 @@ public virtual Note Add(ObjectId targetId, string message, Signature author, Sig
             return RetrieveNote(targetId, canonicalNamespace);
         }
 
-        /// <summary>
-        ///   Creates or updates a <see cref = "Note"/> on the specified object, and for the given namespace.
-        /// </summary>
-        /// <param name = "targetId">The target <see cref = "ObjectId"/>, for which the note will be created.</param>
-        /// <param name = "message">The note message.</param>
-        /// <param name = "author">The author.</param>
-        /// <param name = "committer">The committer.</param>
-        /// <param name = "namespace">The namespace on which the note will be created. It can be either a canonical namespace or an abbreviated namespace ('refs/notes/myNamespace' or just 'myNamespace').</param>
-        /// <returns>The note which was just saved.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Note Create(ObjectId targetId, string message, Signature author, Signature committer, string @namespace)
-        {
-            return Add(targetId, message, author, committer, @namespace);
-        }
-
         /// <summary>
         ///   Deletes the note on the specified object, and for the given namespace.
         /// </summary>
@@ -218,19 +203,6 @@ public virtual void Remove(ObjectId targetId, Signature author, Signature commit
             Proxy.git_note_remove(repo.Handle, canonicalNamespace, author, committer, targetId);
         }
 
-        /// <summary>
-        ///   Deletes the note on the specified object, and for the given namespace.
-        /// </summary>
-        /// <param name = "targetId">The target <see cref = "ObjectId"/>, for which the note will be created.</param>
-        /// <param name = "author">The author.</param>
-        /// <param name = "committer">The committer.</param>
-        /// <param name = "namespace">The namespace on which the note will be removed. It can be either a canonical namespace or an abbreviated namespace ('refs/notes/myNamespace' or just 'myNamespace').</param>
-        [Obsolete("This method will be removed in the next release. Please use Remove() instead.")]
-        public virtual void Delete(ObjectId targetId, Signature author, Signature committer, string @namespace)
-        {
-            Remove(targetId, author, committer, @namespace);
-        }
-
         private string DebuggerDisplay
         {
             get
diff --git a/LibGit2Sharp/ReferenceCollection.cs b/LibGit2Sharp/ReferenceCollection.cs
index f86652d74..3c19e02b2 100644
--- a/LibGit2Sharp/ReferenceCollection.cs
+++ b/LibGit2Sharp/ReferenceCollection.cs
@@ -102,19 +102,6 @@ public virtual SymbolicReference Add(string name, Reference targetRef, bool allo
             }
         }
 
-        /// <summary>
-        ///   Creates a direct or symbolic reference with the specified name and target
-        /// </summary>
-        /// <param name = "name">The name of the reference to create.</param>
-        /// <param name = "target">The target which can be either a sha or the canonical name of another reference.</param>
-        /// <param name = "allowOverwrite">True to allow silent overwriting a potentially existing reference, false otherwise.</param>
-        /// <returns>A new <see cref = "Reference" />.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Reference Create(string name, string target, bool allowOverwrite = false)
-        {
-            return this.Add(name, target, allowOverwrite);
-        }
-
         /// <summary>
         ///   Remove a reference from the repository
         /// </summary>
@@ -129,16 +116,6 @@ public virtual void Remove(Reference reference)
             }
         }
 
-        /// <summary>
-        ///   Delete a reference with the specified name
-        /// </summary>
-        /// <param name = "name">The name of the reference to delete.</param>
-        [Obsolete("This method will be removed in the next release. Please use Remove() instead.")]
-        public virtual void Delete(string name)
-        {
-            this.Remove(name);
-        }
-
         /// <summary>
         ///   Rename an existing reference with a new name
         /// </summary>
diff --git a/LibGit2Sharp/RemoteCollection.cs b/LibGit2Sharp/RemoteCollection.cs
index 94da5eb62..bd5efb097 100644
--- a/LibGit2Sharp/RemoteCollection.cs
+++ b/LibGit2Sharp/RemoteCollection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -89,21 +88,6 @@ public virtual Remote Add(string name, string url)
             }
         }
 
-        /// <summary>
-        ///   Creates a <see cref="Remote"/> with the specified name and for the repository at the specified location.
-        ///   <para>
-        ///     A default fetch refspec will be added for this remote.
-        ///   </para>
-        /// </summary>
-        /// <param name = "name">The name of the remote to create.</param>
-        /// <param name = "url">The location of the repository.</param>
-        /// <returns>A new <see cref = "Remote" />.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Remote Create(string name, string url)
-        {
-            return Add(name, url);
-        }
-
         /// <summary>
         ///   Creates a <see cref="Remote"/> with the specified name and for the repository at the specified location.
         /// </summary>
@@ -125,19 +109,6 @@ public virtual Remote Add(string name, string url, string fetchRefSpec)
             }
         }
 
-        /// <summary>
-        ///   Creates a <see cref="Remote"/> with the specified name and for the repository at the specified location.
-        /// </summary>
-        /// <param name = "name">The name of the remote to create.</param>
-        /// <param name = "url">The location of the repository.</param>
-        /// <param name = "fetchRefSpec">The refSpec to be used when fetching from this remote..</param>
-        /// <returns>A new <see cref = "Remote" />.</returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Remote Create(string name, string url, string fetchRefSpec)
-        {
-            return Add(name, url);
-        }
-
         /// <summary>
         ///   Determines if the proposed remote name is well-formed.
         /// </summary>
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
index 9f5748f90..1babaeadf 100644
--- a/LibGit2Sharp/Repository.cs
+++ b/LibGit2Sharp/Repository.cs
@@ -261,15 +261,6 @@ public ReferenceCollection Refs
             get { return refs; }
         }
 
-        /// <summary>
-        ///   Lookup and manage remotes in the repository.
-        /// </summary>
-        [Obsolete("This property will be removed in the next release. Please use Repository.Network.Remotes instead.")]
-        public RemoteCollection Remotes
-        {
-            get { return Network.Remotes; }
-        }
-
         /// <summary>
         ///   Lookup and enumerate commits in the repository.
         ///   Iterating this collection directly starts walking from the HEAD.
diff --git a/LibGit2Sharp/RepositoryInformation.cs b/LibGit2Sharp/RepositoryInformation.cs
index 8c055d83b..91934c0f9 100644
--- a/LibGit2Sharp/RepositoryInformation.cs
+++ b/LibGit2Sharp/RepositoryInformation.cs
@@ -46,18 +46,6 @@ internal RepositoryInformation(Repository repo, bool isBare)
         /// </summary>
         public virtual bool IsBare { get; private set; }
 
-        /// <summary>
-        ///   Gets a value indicating whether this repository is empty.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if this repository is empty; otherwise, <c>false</c>.
-        /// </value>
-        [Obsolete("This method will be removed in the next release.")]
-        public virtual bool IsEmpty
-        {
-            get { return Proxy.git_repository_is_empty(repo.Handle); }
-        }
-
         /// <summary>
         ///   Indicates whether the Head points to an arbitrary commit instead of the tip of a local branch.
         /// </summary>
diff --git a/LibGit2Sharp/TagCollection.cs b/LibGit2Sharp/TagCollection.cs
index aac77a28f..5e08e5fbb 100644
--- a/LibGit2Sharp/TagCollection.cs
+++ b/LibGit2Sharp/TagCollection.cs
@@ -94,21 +94,6 @@ public virtual Tag Add(string name, GitObject target, Signature tagger, string m
             return this[name];
         }
 
-        /// <summary>
-        ///   Creates an annotated tag with the specified name.
-        /// </summary>
-        /// <param name = "name">The name.</param>
-        /// <param name = "target">The target which can be sha or a canonical reference name.</param>
-        /// <param name = "tagger">The tagger.</param>
-        /// <param name = "message">The message.</param>
-        /// <param name = "allowOverwrite">True to allow silent overwriting a potentially existing tag, false otherwise.</param>
-        /// <returns></returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Tag Create(string name, string target, Signature tagger, string message, bool allowOverwrite = false)
-        {
-            return this.Add(name, target, tagger, message, allowOverwrite);
-        }
-
         /// <summary>
         ///   Creates a lightweight tag with the specified name.
         /// </summary>
@@ -126,19 +111,6 @@ public virtual Tag Add(string name, GitObject target, bool allowOverwrite = fals
             return this[name];
         }
 
-        /// <summary>
-        ///   Creates a lightweight tag with the specified name.
-        /// </summary>
-        /// <param name = "name">The name.</param>
-        /// <param name = "target">The target which can be sha or a canonical reference name.</param>
-        /// <param name = "allowOverwrite">True to allow silent overwriting a potentially existing tag, false otherwise.</param>
-        /// <returns></returns>
-        [Obsolete("This method will be removed in the next release. Please use Add() instead.")]
-        public virtual Tag Create(string name, string target, bool allowOverwrite = false)
-        {
-            return this.Add(name, target, allowOverwrite);
-        }
-
         /// <summary>
         ///   Deletes the tag with the specified name.
         /// </summary>
@@ -150,16 +122,6 @@ public virtual void Remove(Tag tag)
             this.Remove(tag.CanonicalName);
         }
 
-        /// <summary>
-        ///   Deletes the tag with the specified name.
-        /// </summary>
-        /// <param name = "name">The short or canonical name of the tag to delete.</param>
-        [Obsolete("This method will be removed in the next release. Please use Remove() instead.")]
-        public virtual void Delete(string name)
-        {
-            this.Remove(name);
-        }
-
         private static string NormalizeToCanonicalName(string name)
         {
             Ensure.ArgumentNotNullOrEmptyString(name, "name");