Removes InfoCard support from the library.

InfoCard support has been removed from recent versions of Windows.  It's effectively dead.

20 files changed, 0 insertions, 1271 deletions

diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ClaimType.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ClaimType.cs
deleted file mode 100644
index 53898ba..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ClaimType.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="ClaimType.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace DotNetOpenAuth.InfoCard {
-	using System;
-	using System.ComponentModel;
-	using System.IdentityModel.Claims;
-	using System.Web.UI;
-
-	/// <summary>
-	/// Description of a claim that is requested or required in a submitted Information Card.
-	/// </summary>
-	[PersistChildren(false)]
-	[Serializable]
-	public class ClaimType {
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ClaimType"/> class.
-		/// </summary>
-		public ClaimType() {
-		}
-
-		/// <summary>
-		/// Gets or sets the URI of a requested claim.
-		/// </summary>
-		/// <remarks>
-		/// For a list of well-known claim type URIs, see the <see cref="ClaimTypes"/> class.
-		/// </remarks>
-		[TypeConverter(typeof(ComponentModel.ClaimTypeSuggestions))]
-		public string Name { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether this claim is optional.
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> if this instance is optional; otherwise, <c>false</c>.
-		/// </value>
-		[DefaultValue(false)]
-		public bool IsOptional { get; set; }
-
-		/// <summary>
-		/// Returns a <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
-		/// </summary>
-		/// <returns>
-		/// A <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
-		/// </returns>
-		public override string ToString() {
-			return this.Name ?? "<no name>";
-		}
-	}
-}
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardImage.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardImage.cs
deleted file mode 100644
index cdb0562..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardImage.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="InfoCardImage.cs" company="Dominick Baier, Andrew Arnott">
-//     Copyright (c) Dominick Baier, Outercurve Foundation. All rights reserved.
-// </copyright>
-// <license>New BSD License</license>
-//-----------------------------------------------------------------------
-
-// embedded images
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_114x80.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_14x10.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_214x150.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_23x16.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_300x210.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_34x24.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_365x256.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_41x29.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_50x35.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_60x42.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_71x50.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_81x57.png", "image/png")]
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.Util.DefaultNamespace + ".InfoCard.infocard_92x64.png", "image/png")]
-
-namespace DotNetOpenAuth.InfoCard {
-	using System;
-	using System.Diagnostics.CodeAnalysis;
-	using System.Globalization;
-
-	/// <summary>
-	/// A set of sizes for which standard InfoCard icons are available.
-	/// </summary>
-	public enum InfoCardImageSize {
-		/// <summary>
-		/// A standard InfoCard icon with size 14x10
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size14x10,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 23x16
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size23x16,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 34x24
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size34x24,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 41x29
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size41x29,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 50x35
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size50x35,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 60x42
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size60x42,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 71x50
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size71x50,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 92x64
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size92x64,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 114x80
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size114x80,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 164x108
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size164x108,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 214x50
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size214x50,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 300x210
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size300x210,
-
-		/// <summary>
-		/// A standard InfoCard icon with size 365x256
-		/// </summary>
-		[SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x", Justification = "By design")]
-		Size365x256,
-	}
-
-	/// <summary>
-	/// Assists in selecting the InfoCard image to display in the user agent.
-	/// </summary>
-	internal static class InfoCardImage {
-		/// <summary>
-		/// The default size of the InfoCard icon to use.
-		/// </summary>
-		internal const InfoCardImageSize DefaultImageSize = InfoCardImageSize.Size114x80;
-
-		/// <summary>
-		/// The format to use when generating the image manifest resource stream name.
-		/// </summary>
-		private const string UrlFormatString = Util.DefaultNamespace + ".InfoCard.infocard_{0}.png";
-
-		/// <summary>
-		/// Gets the name of the image manifest resource stream for an InfoCard image of the given size.
-		/// </summary>
-		/// <param name="size">The size of the desired InfoCard image.</param>
-		/// <returns>The manifest resource stream name.</returns>
-		internal static string GetImageManifestResourceStreamName(InfoCardImageSize size) {
-			string imageSize = size.ToString();
-			Assumes.True(imageSize.Length >= 6);
-			imageSize = imageSize.Substring(4);
-			return string.Format(CultureInfo.InvariantCulture, UrlFormatString, imageSize);
-		}
-	}
-}
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardSelector.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardSelector.cs
deleted file mode 100644
index 3b6b368..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/InfoCardSelector.cs
+++ /dev/null
@@ -1,764 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="InfoCardSelector.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
-//     Certain elements are Copyright (c) 2007 Dominick Baier.
-// </copyright>
-//-----------------------------------------------------------------------
-
-[assembly: System.Web.UI.WebResource(DotNetOpenAuth.InfoCard.InfoCardSelector.ScriptResourceName, "text/javascript")]
-
-namespace DotNetOpenAuth.InfoCard {
-	using System;
-	using System.Collections.ObjectModel;
-	using System.ComponentModel;
-	using System.Diagnostics.CodeAnalysis;
-	using System.Diagnostics.Contracts;
-	using System.Drawing.Design;
-	using System.Globalization;
-	using System.Linq;
-	using System.Text;
-	using System.Text.RegularExpressions;
-	using System.Web;
-	using System.Web.UI;
-	using System.Web.UI.HtmlControls;
-	using System.Web.UI.WebControls;
-	using System.Xml;
-	using DotNetOpenAuth.Messaging;
-	using Validation;
-
-	/// <summary>
-	/// The style to use for NOT displaying a hidden region.
-	/// </summary>
-	public enum RenderMode {
-		/// <summary>
-		/// A hidden region should be invisible while still occupying space in the page layout.
-		/// </summary>
-		Static,
-
-		/// <summary>
-		/// A hidden region should collapse so that it does not occupy space in the page layout.
-		/// </summary>
-		Dynamic
-	}
-
-	/// <summary>
-	/// An Information Card selector ASP.NET control.
-	/// </summary>
-	[ParseChildren(true, "ClaimsRequested")]
-	[PersistChildren(false)]
-	[DefaultEvent("ReceivedToken")]
-	[ToolboxData("<{0}:InfoCardSelector runat=\"server\"><ClaimsRequested><{0}:ClaimType Name=\"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonalidentifier\" /></ClaimsRequested><UnsupportedTemplate><p>Your browser does not support Information Cards.</p></UnsupportedTemplate></{0}:InfoCardSelector>")]
-	public class InfoCardSelector : CompositeControl, IPostBackEventHandler {
-		/// <summary>
-		/// The resource name for getting at the SupportingScript.js embedded manifest stream.
-		/// </summary>
-		internal const string ScriptResourceName = "DotNetOpenAuth.InfoCard.SupportingScript.js";
-
-		#region Property constants
-
-		/// <summary>
-		/// Default value for the <see cref="RenderMode"/> property.
-		/// </summary>
-		private const RenderMode RenderModeDefault = RenderMode.Dynamic;
-
-		/// <summary>
-		/// Default value for the <see cref="AutoPostBack"/> property.
-		/// </summary>
-		private const bool AutoPostBackDefault = true;
-
-		/// <summary>
-		/// Default value for the <see cref="AutoPopup"/> property.
-		/// </summary>
-		private const bool AutoPopupDefault = false;
-
-		/// <summary>
-		/// Default value for the <see cref="PrivacyUrl"/> property.
-		/// </summary>
-		private const string PrivacyUrlDefault = "";
-
-		/// <summary>
-		/// Default value for the <see cref="PrivacyVersion"/> property.
-		/// </summary>
-		private const string PrivacyVersionDefault = "";
-
-		/// <summary>
-		/// Default value for the <see cref="InfoCardImage"/> property.
-		/// </summary>
-		private const InfoCardImageSize InfoCardImageDefault = InfoCardImage.DefaultImageSize;
-
-		/// <summary>
-		/// Default value for the <see cref="IssuerPolicy"/> property.
-		/// </summary>
-		private const string IssuerPolicyDefault = "";
-
-		/// <summary>
-		/// Default value for the <see cref="Issuer"/> property.
-		/// </summary>
-		private const string IssuerDefault = WellKnownIssuers.SelfIssued;
-
-		/// <summary>
-		/// The default value for the <see cref="TokenType"/> property.
-		/// </summary>
-		private const string TokenTypeDefault = "urn:oasis:names:tc:SAML:1.0:assertion";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="Issuer" /> property.
-		/// </summary>
-		private const string IssuerViewStateKey = "Issuer";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="IssuerPolicy" /> property.
-		/// </summary>
-		private const string IssuerPolicyViewStateKey = "IssuerPolicy";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="AutoPopup" /> property.
-		/// </summary>
-		private const string AutoPopupViewStateKey = "AutoPopup";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="ClaimsRequested" /> property.
-		/// </summary>
-		private const string ClaimsRequestedViewStateKey = "ClaimsRequested";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="TokenType" /> property.
-		/// </summary>
-		private const string TokenTypeViewStateKey = "TokenType";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="PrivacyUrl" /> property.
-		/// </summary>
-		private const string PrivacyUrlViewStateKey = "PrivacyUrl";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="PrivacyVersion" /> property.
-		/// </summary>
-		private const string PrivacyVersionViewStateKey = "PrivacyVersion";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="Audience" /> property.
-		/// </summary>
-		private const string AudienceViewStateKey = "Audience";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="AutoPostBack" /> property.
-		/// </summary>
-		private const string AutoPostBackViewStateKey = "AutoPostBack";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="ImageSize" /> property.
-		/// </summary>
-		private const string ImageSizeViewStateKey = "ImageSize";
-
-		/// <summary>
-		/// The viewstate key for storing the <see cref="RenderMode" /> property.
-		/// </summary>
-		private const string RenderModeViewStateKey = "RenderMode";
-
-		#endregion
-
-		#region Categories
-
-		/// <summary>
-		/// The "Behavior" property category.
-		/// </summary>
-		private const string BehaviorCategory = "Behavior";
-
-		/// <summary>
-		/// The "Appearance" property category.
-		/// </summary>
-		private const string AppearanceCategory = "Appearance";
-
-		/// <summary>
-		/// The "InfoCard" property category.
-		/// </summary>
-		private const string InfoCardCategory = "InfoCard";
-
-		#endregion
-
-		/// <summary>
-		/// The panel containing the controls to display if InfoCard is supported in the user agent.
-		/// </summary>
-		private Panel infoCardSupportedPanel;
-
-		/// <summary>
-		/// The panel containing the controls to display if InfoCard is NOT supported in the user agent.
-		/// </summary>
-		private Panel infoCardNotSupportedPanel;
-
-		/// <summary>
-		/// Recalls whether the <see cref="Audience"/> property has been set yet,
-		/// so its default can be set as soon as possible without overwriting
-		/// an intentional value.
-		/// </summary>
-		private bool audienceSet;
-
-		/// <summary>
-		/// Initializes a new instance of the <see cref="InfoCardSelector"/> class.
-		/// </summary>
-		public InfoCardSelector() {
-			this.ToolTip = InfoCardStrings.SelectorClickPrompt;
-			Reporting.RecordFeatureUse(this);
-		}
-
-		/// <summary>
-		/// Occurs when an InfoCard has been submitted but not decoded yet.
-		/// </summary>
-		[Category(InfoCardCategory)]
-		public event EventHandler<ReceivingTokenEventArgs> ReceivingToken;
-
-		/// <summary>
-		/// Occurs when an InfoCard has been submitted and decoded.
-		/// </summary>
-		[Category(InfoCardCategory)]
-		public event EventHandler<ReceivedTokenEventArgs> ReceivedToken;
-
-		/// <summary>
-		/// Occurs when an InfoCard token is submitted but an error occurs in processing.
-		/// </summary>
-		[Category(InfoCardCategory)]
-		public event EventHandler<TokenProcessingErrorEventArgs> TokenProcessingError;
-
-		#region Properties
-
-		/// <summary>
-		/// Gets the set of claims that are requested from the Information Card.
-		/// </summary>
-		[Description("Specifies the required and optional claims.")]
-		[PersistenceMode(PersistenceMode.InnerProperty), Category(InfoCardCategory)]
-		public Collection<ClaimType> ClaimsRequested {
-			get {
-				if (this.ViewState[ClaimsRequestedViewStateKey] == null) {
-					var claims = new Collection<ClaimType>();
-					this.ViewState[ClaimsRequestedViewStateKey] = claims;
-					return claims;
-				} else {
-					return (Collection<ClaimType>)this.ViewState[ClaimsRequestedViewStateKey];
-				}
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the issuer URI.
-		/// </summary>
-		[Description("When receiving managed cards, this is the only Issuer whose cards will be accepted.")]
-		[Category(InfoCardCategory), DefaultValue(IssuerDefault)]
-		[TypeConverter(typeof(ComponentModel.IssuersSuggestions))]
-		public string Issuer {
-			get { return (string)this.ViewState[IssuerViewStateKey] ?? IssuerDefault; }
-			set { this.ViewState[IssuerViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the issuer policy URI.
-		/// </summary>
-		[Description("Specifies the URI of the issuer MEX endpoint")]
-		[Category(InfoCardCategory), DefaultValue(IssuerPolicyDefault)]
-		public string IssuerPolicy {
-			get { return (string)this.ViewState[IssuerPolicyViewStateKey] ?? IssuerPolicyDefault; }
-			set { this.ViewState[IssuerPolicyViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the URL to this site's privacy policy.
-		/// </summary>
-		[Description("The URL to this site's privacy policy.")]
-		[Category(InfoCardCategory), DefaultValue(PrivacyUrlDefault)]
-		[SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "System.Uri", Justification = "We construct a Uri to validate the format of the string.")]
-		[SuppressMessage("Microsoft.Usage", "CA2234:PassSystemUriObjectsInsteadOfStrings", Justification = "That overload is NOT the same.")]
-		[SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings", Justification = "This can take ~/ paths.")]
-		public string PrivacyUrl {
-			get {
-				return (string)this.ViewState[PrivacyUrlViewStateKey] ?? PrivacyUrlDefault;
-			}
-
-			set {
-				ErrorUtilities.VerifyOperation(string.IsNullOrEmpty(value) || this.Page == null || this.DesignMode || (HttpContext.Current != null && HttpContext.Current.Request != null), MessagingStrings.HttpContextRequired);
-				if (!string.IsNullOrEmpty(value)) {
-					if (this.Page != null && !this.DesignMode) {
-						// Validate new value by trying to construct a Uri based on it.
-						new Uri(new HttpRequestWrapper(HttpContext.Current.Request).GetPublicFacingUrl(), this.Page.ResolveUrl(value)); // throws an exception on failure.
-					} else {
-						// We can't fully test it, but it should start with either ~/ or a protocol.
-						if (Regex.IsMatch(value, @"^https?://")) {
-							new Uri(value); // make sure it's fully-qualified, but ignore wildcards
-						} else if (value.StartsWith("~/", StringComparison.Ordinal)) {
-							// this is valid too
-						} else {
-							throw new UriFormatException();
-						}
-					}
-				}
-
-				this.ViewState[PrivacyUrlViewStateKey] = value;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the version of the privacy policy file.
-		/// </summary>
-		[Description("Specifies the version of the privacy policy file")]
-		[Category(InfoCardCategory), DefaultValue(PrivacyVersionDefault)]
-		public string PrivacyVersion {
-			get { return (string)this.ViewState[PrivacyVersionViewStateKey] ?? PrivacyVersionDefault; }
-			set { this.ViewState[PrivacyVersionViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the URI that must be found for the SAML token's intended audience
-		/// in order for the token to be processed.
-		/// </summary>
-		/// <value>Typically the URI of the page hosting the control, or <c>null</c> to disable audience verification.</value>
-		/// <remarks>
-		/// Disabling audience verification introduces a security risk 
-		/// because tokens can be redirected to allow access to unintended resources.
-		/// </remarks>
-		[Description("Specifies the URI that must be found for the SAML token's intended audience.")]
-		[Bindable(true), Category(InfoCardCategory)]
-		[TypeConverter(typeof(ComponentModel.UriConverter))]
-		[UrlProperty, Editor("System.Web.UI.Design.UrlEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
-		public Uri Audience {
-			get {
-				return (Uri)this.ViewState[AudienceViewStateKey];
-			}
-
-			set {
-				this.ViewState[AudienceViewStateKey] = value;
-				this.audienceSet = true;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets a value indicating whether a postback will automatically
-		/// be invoked when the user selects an Information Card.
-		/// </summary>
-		[Description("Specifies if the pages automatically posts back after the user has selected a card")]
-		[Category(BehaviorCategory), DefaultValue(AutoPostBackDefault)]
-		public bool AutoPostBack {
-			get { return (bool)(this.ViewState[AutoPostBackViewStateKey] ?? AutoPostBackDefault); }
-			set { this.ViewState[AutoPostBackViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the size of the standard InfoCard image to display.
-		/// </summary>
-		/// <value>The default size is 114x80.</value>
-		[Description("The size of the InfoCard image to use. Defaults to 114x80.")]
-		[DefaultValue(InfoCardImageDefault), Category(AppearanceCategory)]
-		public InfoCardImageSize ImageSize {
-			get { return (InfoCardImageSize)(this.ViewState[ImageSizeViewStateKey] ?? InfoCardImageDefault); }
-			set { this.ViewState[ImageSizeViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets the template to display when the user agent lacks
-		/// an Information Card selector.
-		/// </summary>
-		[Browsable(false), DefaultValue("")]
-		[PersistenceMode(PersistenceMode.InnerProperty), TemplateContainer(typeof(InfoCardSelector))]
-		public virtual ITemplate UnsupportedTemplate { get; set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether a hidden region (either
-		/// the unsupported or supported InfoCard HTML)
-		/// collapses or merely becomes invisible when it is not to be displayed.
-		/// </summary>
-		[Description("Whether the hidden region collapses or merely becomes invisible.")]
-		[Category(AppearanceCategory), DefaultValue(RenderModeDefault)]
-		public RenderMode RenderMode {
-			get { return (RenderMode)(this.ViewState[RenderModeViewStateKey] ?? RenderModeDefault); }
-			set { this.ViewState[RenderModeViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// Gets or sets a value indicating whether the identity selector will be triggered at page load.
-		/// </summary>
-		[Description("Controls whether the InfoCard selector automatically appears when the page is loaded.")]
-		[Category(BehaviorCategory), DefaultValue(AutoPopupDefault)]
-		public bool AutoPopup {
-			get { return (bool)(this.ViewState[AutoPopupViewStateKey] ?? AutoPopupDefault); }
-			set { this.ViewState[AutoPopupViewStateKey] = value; }
-		}
-
-		#endregion
-
-		/// <summary>
-		/// Gets the name of the hidden field that is used to transport the token back to the server.
-		/// </summary>
-		private string HiddenFieldName {
-			get { return this.ClientID + "_tokenxml"; }
-		}
-
-		/// <summary>
-		/// Gets the id of the OBJECT tag that creates the InfoCard Selector.
-		/// </summary>
-		private string SelectorObjectId {
-			get { return this.ClientID + "_cs"; }
-		}
-
-		/// <summary>
-		/// Gets the XML token, which will be encrypted if it was received over SSL.
-		/// </summary>
-		private string TokenXml {
-			get { return this.Page.Request.Form[this.HiddenFieldName]; }
-		}
-
-		/// <summary>
-		/// Gets or sets the type of token the page is prepared to receive.
-		/// </summary>
-		[Description("Specifies the token type. Defaults to SAML 1.0")]
-		[DefaultValue(TokenTypeDefault), Category(InfoCardCategory)]
-		private string TokenType {
-			get { return (string)this.ViewState[TokenTypeViewStateKey] ?? TokenTypeDefault; }
-			set { this.ViewState[TokenTypeViewStateKey] = value; }
-		}
-
-		/// <summary>
-		/// When implemented by a class, enables a server control to process an event raised when a form is posted to the server.
-		/// </summary>
-		/// <param name="eventArgument">A <see cref="T:System.String"/> that represents an optional event argument to be passed to the event handler.</param>
-		void IPostBackEventHandler.RaisePostBackEvent(string eventArgument) {
-			this.RaisePostBackEvent(eventArgument);
-		}
-
-		/// <summary>
-		/// When implemented by a class, enables a server control to process an event raised when a form is posted to the server.
-		/// </summary>
-		/// <param name="eventArgument">A <see cref="T:System.String"/> that represents an optional event argument to be passed to the event handler.</param>
-		[SuppressMessage("Microsoft.Design", "CA1030:UseEventsWhereAppropriate", Justification = "Predefined signature.")]
-		protected virtual void RaisePostBackEvent(string eventArgument) {
-			if (!string.IsNullOrEmpty(this.TokenXml)) {
-				try {
-					ReceivingTokenEventArgs receivingArgs = this.OnReceivingToken(this.TokenXml);
-
-					if (!receivingArgs.Cancel) {
-						try {
-							Token token = Token.Read(this.TokenXml, this.Audience, receivingArgs.DecryptingTokens);
-							this.OnReceivedToken(token);
-						} catch (InformationCardException ex) {
-							this.OnTokenProcessingError(this.TokenXml, ex);
-						}
-					}
-				} catch (XmlException ex) {
-					this.OnTokenProcessingError(this.TokenXml, ex);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Fires the <see cref="ReceivingToken"/> event.
-		/// </summary>
-		/// <param name="tokenXml">The token XML, prior to any processing.</param>
-		/// <returns>The event arguments sent to the event handlers.</returns>
-		[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "decryptor", Justification = "By design")]
-		protected virtual ReceivingTokenEventArgs OnReceivingToken(string tokenXml) {
-			Requires.NotNull(tokenXml, "tokenXml");
-
-			var args = new ReceivingTokenEventArgs(tokenXml);
-			var receivingToken = this.ReceivingToken;
-			if (receivingToken != null) {
-				receivingToken(this, args);
-			}
-
-			return args;
-		}
-
-		/// <summary>
-		/// Fires the <see cref="ReceivedToken"/> event.
-		/// </summary>
-		/// <param name="token">The token, if it was decrypted.</param>
-		protected virtual void OnReceivedToken(Token token) {
-			Requires.NotNull(token, "token");
-
-			var receivedInfoCard = this.ReceivedToken;
-			if (receivedInfoCard != null) {
-				receivedInfoCard(this, new ReceivedTokenEventArgs(token));
-			}
-		}
-
-		/// <summary>
-		/// Fires the <see cref="TokenProcessingError"/> event.
-		/// </summary>
-		/// <param name="unprocessedToken">The unprocessed token.</param>
-		/// <param name="ex">The exception generated while processing the token.</param>
-		protected virtual void OnTokenProcessingError(string unprocessedToken, Exception ex) {
-			Requires.NotNull(unprocessedToken, "unprocessedToken");
-			Requires.NotNull(ex, "ex");
-
-			var tokenProcessingError = this.TokenProcessingError;
-			if (tokenProcessingError != null) {
-				TokenProcessingErrorEventArgs args = new TokenProcessingErrorEventArgs(unprocessedToken, ex);
-				tokenProcessingError(this, args);
-			}
-		}
-
-		/// <summary>
-		/// Raises the <see cref="E:System.Web.UI.Control.Init"/> event.
-		/// </summary>
-		/// <param name="e">An <see cref="T:System.EventArgs"/> object that contains the event data.</param>
-		protected override void OnInit(EventArgs e) {
-			// Give a default for the Audience property that allows for 
-			// the aspx page to have preset it, and ViewState
-			// to initialize it (even to null) after this.
-			if (!this.audienceSet && !this.DesignMode) {
-				this.Audience = this.Page.Request.Url;
-			}
-
-			base.OnInit(e);
-			this.Page.LoadComplete += delegate { this.EnsureChildControls(); };
-		}
-
-		/// <summary>
-		/// Called by the ASP.NET page framework to notify server controls that use composition-based implementation to create any child controls they contain in preparation for posting back or rendering.
-		/// </summary>
-		protected override void CreateChildControls() {
-			base.CreateChildControls();
-
-			this.Page.ClientScript.RegisterHiddenField(this.HiddenFieldName, string.Empty);
-
-			this.Controls.Add(this.infoCardSupportedPanel = this.CreateInfoCardSupportedPanel());
-			this.Controls.Add(this.infoCardNotSupportedPanel = this.CreateInfoCardUnsupportedPanel());
-
-			this.RenderSupportingScript();
-		}
-
-		/// <summary>
-		/// Raises the <see cref="E:System.Web.UI.Control.PreRender"/> event.
-		/// </summary>
-		/// <param name="e">An <see cref="T:System.EventArgs"/> object that contains the event data.</param>
-		protected override void OnPreRender(EventArgs e) {
-			base.OnPreRender(e);
-
-			if (!this.DesignMode) {
-				// The Cardspace selector will display an ugly error to the user if
-				// the privacy URL is present but the privacy version is not.
-				ErrorUtilities.VerifyOperation(string.IsNullOrEmpty(this.PrivacyUrl) || !string.IsNullOrEmpty(this.PrivacyVersion), InfoCardStrings.PrivacyVersionRequiredWithPrivacyUrl);
-			}
-
-			this.RegisterInfoCardSelectorObjectScript();
-		}
-
-		/// <summary>
-		/// Creates a control that renders to &lt;Param Name="{0}" Value="{1}" /&gt;
-		/// </summary>
-		/// <param name="name">The parameter name.</param>
-		/// <param name="value">The parameter value.</param>
-		/// <returns>The control that renders to the Param tag.</returns>
-		private static string CreateParamJs(string name, string value) {
-			string scriptFormat = @"	objp = document.createElement('param');
-	objp.name = {0};
-	objp.value = {1};
-	obj.appendChild(objp);
-";
-			return string.Format(
-				CultureInfo.InvariantCulture,
-				scriptFormat,
-			MessagingUtilities.GetSafeJavascriptValue(name),
-			MessagingUtilities.GetSafeJavascriptValue(value));
-		}
-
-		/// <summary>
-		/// Creates the panel whose contents are displayed to the user
-		/// on a user agent that has an Information Card selector.
-		/// </summary>
-		/// <returns>The Panel control</returns>
-		[Pure]
-		private Panel CreateInfoCardSupportedPanel() {
-			Panel supportedPanel = new Panel();
-
-			try {
-				if (!this.DesignMode) {
-					// At the user agent, assume InfoCard is not supported until
-					// the JavaScript discovers otherwise and reveals this panel.
-					supportedPanel.Style[HtmlTextWriterStyle.Display] = "none";
-				}
-
-				supportedPanel.Controls.Add(this.CreateInfoCardImage());
-
-				// trigger the selector at page load?
-				if (this.AutoPopup && !this.Page.IsPostBack) {
-					this.Page.ClientScript.RegisterStartupScript(
-						typeof(InfoCardSelector),
-						"selector_load_trigger",
-						this.GetInfoCardSelectorActivationScript(true),
-						true);
-				}
-				return supportedPanel;
-			} catch {
-				supportedPanel.Dispose();
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Gets the InfoCard selector activation script.
-		/// </summary>
-		/// <param name="alwaysPostback">Whether a postback should always immediately follow the selector, even if <see cref="AutoPostBack"/> is <c>false</c>.</param>
-		/// <returns>The javascript to inject into the surrounding context.</returns>
-		private string GetInfoCardSelectorActivationScript(bool alwaysPostback) {
-			// generate call do __doPostback
-			PostBackOptions options = new PostBackOptions(this);
-			string postback = string.Empty;
-			if (alwaysPostback || this.AutoPostBack) {
-				postback = this.Page.ClientScript.GetPostBackEventReference(options) + ";";
-			}
-
-			// generate the onclick script for the image
-			string invokeScript = string.Format(
-				CultureInfo.InvariantCulture,
-				@"if (document.infoCard.activate('{0}', '{1}')) {{ {2} }}",
-				this.SelectorObjectId,
-				this.HiddenFieldName,
-				postback);
-
-			return invokeScript;
-		}
-
-		/// <summary>
-		/// Creates the panel whose contents are displayed to the user
-		/// on a user agent that does not have an Information Card selector.
-		/// </summary>
-		/// <returns>The Panel control.</returns>
-		[Pure]
-		private Panel CreateInfoCardUnsupportedPanel() {
-			Panel unsupportedPanel = new Panel();
-			try {
-				if (this.UnsupportedTemplate != null) {
-					this.UnsupportedTemplate.InstantiateIn(unsupportedPanel);
-				}
-				return unsupportedPanel;
-			} catch {
-				unsupportedPanel.Dispose();
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Adds the javascript that adds the info card selector &lt;object&gt; HTML tag to the page.
-		/// </summary>
-		[Pure]
-		private void RegisterInfoCardSelectorObjectScript() {
-			string scriptFormat = @"{{
-	var obj = document.createElement('object');
-	obj.type = 'application/x-informationcard';
-	obj.id = {0};
-	obj.style.display = 'none';
-";
-			StringBuilder script = new StringBuilder();
-			script.AppendFormat(
-				CultureInfo.InvariantCulture,
-				scriptFormat,
-				MessagingUtilities.GetSafeJavascriptValue(this.ClientID + "_cs"));
-
-			if (!string.IsNullOrEmpty(this.Issuer)) {
-				script.AppendLine(CreateParamJs("issuer", this.Issuer));
-			}
-
-			if (!string.IsNullOrEmpty(this.IssuerPolicy)) {
-				script.AppendLine(CreateParamJs("issuerPolicy", this.IssuerPolicy));
-			}
-
-			if (!string.IsNullOrEmpty(this.TokenType)) {
-				script.AppendLine(CreateParamJs("tokenType", this.TokenType));
-			}
-
-			string requiredClaims, optionalClaims;
-			this.GetRequestedClaims(out requiredClaims, out optionalClaims);
-			ErrorUtilities.VerifyArgument(!string.IsNullOrEmpty(requiredClaims) || !string.IsNullOrEmpty(optionalClaims), InfoCardStrings.EmptyClaimListNotAllowed);
-			if (!string.IsNullOrEmpty(requiredClaims)) {
-				script.AppendLine(CreateParamJs("requiredClaims", requiredClaims));
-			}
-			if (!string.IsNullOrEmpty(optionalClaims)) {
-				script.AppendLine(CreateParamJs("optionalClaims", optionalClaims));
-			}
-
-			if (!string.IsNullOrEmpty(this.PrivacyUrl)) {
-				string privacyUrl = this.DesignMode ? this.PrivacyUrl : new Uri(Page.Request.Url, Page.ResolveUrl(this.PrivacyUrl)).AbsoluteUri;
-				script.AppendLine(CreateParamJs("privacyUrl", privacyUrl));
-			}
-
-			if (!string.IsNullOrEmpty(this.PrivacyVersion)) {
-				script.AppendLine(CreateParamJs("privacyVersion", this.PrivacyVersion));
-			}
-
-			script.AppendLine(@"if (document.infoCard.isSupported()) { document.getElementsByTagName('head')[0].appendChild(obj); }
-}");
-
-			this.Page.ClientScript.RegisterClientScriptBlock(typeof(InfoCardSelector), this.ClientID + "tag", script.ToString(), true);
-		}
-
-		/// <summary>
-		/// Creates the info card clickable image.
-		/// </summary>
-		/// <returns>An Image object.</returns>
-		[Pure]
-		private Image CreateInfoCardImage() {
-			// add clickable image
-			Image image = new Image();
-			try {
-				image.ImageUrl = this.Page.ClientScript.GetWebResourceUrl(typeof(InfoCardSelector), InfoCardImage.GetImageManifestResourceStreamName(this.ImageSize));
-				image.AlternateText = InfoCardStrings.SelectorClickPrompt;
-				image.ToolTip = this.ToolTip;
-				image.Style[HtmlTextWriterStyle.Cursor] = "hand";
-
-				image.Attributes["onclick"] = this.GetInfoCardSelectorActivationScript(false);
-				return image;
-			} catch {
-				image.Dispose();
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Compiles lists of requested/required claims that should accompany
-		/// any submitted Information Card.
-		/// </summary>
-		/// <param name="required">A space-delimited list of claim type URIs for claims that must be included in a submitted Information Card.</param>
-		/// <param name="optional">A space-delimited list of claim type URIs for claims that may optionally be included in a submitted Information Card.</param>
-		[Pure]
-		private void GetRequestedClaims(out string required, out string optional) {
-			RequiresEx.ValidState(this.ClaimsRequested != null);
-
-			var nonEmptyClaimTypes = this.ClaimsRequested.Where(c => c.Name != null);
-
-			var optionalClaims = from claim in nonEmptyClaimTypes
-								 where claim.IsOptional
-								 select claim.Name;
-			var requiredClaims = from claim in nonEmptyClaimTypes
-								 where !claim.IsOptional
-								 select claim.Name;
-
-			string[] requiredClaimsArray = requiredClaims.ToArray();
-			string[] optionalClaimsArray = optionalClaims.ToArray();
-			required = string.Join(" ", requiredClaimsArray);
-			optional = string.Join(" ", optionalClaimsArray);
-			Assumes.True(required != null);
-			Assumes.True(optional != null);
-		}
-
-		/// <summary>
-		/// Adds Javascript snippets to the page to help the Information Card selector do its work,
-		/// or to downgrade gracefully if the user agent lacks an Information Card selector.
-		/// </summary>
-		private void RenderSupportingScript() {
-			RequiresEx.ValidState(this.infoCardSupportedPanel != null);
-
-			this.Page.ClientScript.RegisterClientScriptResource(typeof(InfoCardSelector), ScriptResourceName);
-
-			if (this.RenderMode == RenderMode.Static) {
-				this.Page.ClientScript.RegisterStartupScript(
-					typeof(InfoCardSelector),
-					"SelectorSupportingScript_" + this.ClientID,
-					string.Format(CultureInfo.InvariantCulture, "document.infoCard.checkStatic('{0}', '{1}');", this.infoCardSupportedPanel.ClientID, this.infoCardNotSupportedPanel.ClientID),
-					true);
-			} else if (RenderMode == RenderMode.Dynamic) {
-				this.Page.ClientScript.RegisterStartupScript(
-					typeof(InfoCardSelector),
-					"SelectorSupportingScript_" + this.ClientID,
-					string.Format(CultureInfo.InvariantCulture, "document.infoCard.checkDynamic('{0}', '{1}');", this.infoCardSupportedPanel.ClientID, this.infoCardNotSupportedPanel.ClientID),
-					true);
-			}
-		}
-	}
-}
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivedTokenEventArgs.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivedTokenEventArgs.cs
deleted file mode 100644
index 2ec124b..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivedTokenEventArgs.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="ReceivedTokenEventArgs.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace DotNetOpenAuth.InfoCard {
-	using System;
-	using System.Diagnostics.CodeAnalysis;
-	using System.Xml.XPath;
-
-	/// <summary>
-	/// Arguments for the <see cref="InfoCardSelector.ReceivedToken"/> event.
-	/// </summary>
-	public class ReceivedTokenEventArgs : EventArgs {
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ReceivedTokenEventArgs"/> class.
-		/// </summary>
-		/// <param name="token">The token.</param>
-		internal ReceivedTokenEventArgs(Token token) {
-			this.Token = token;
-		}
-
-		/// <summary>
-		/// Gets the processed token.
-		/// </summary>
-		public Token Token { get; private set; }
-
-#if CONTRACTS_FULL
-		/// <summary>
-		/// Verifies conditions that should be true for any valid state of this object.
-		/// </summary>
-		[SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Called by code contracts.")]
-		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Called by code contracts.")]
-		[ContractInvariantMethod]
-		private void ObjectInvariant() {
-			Contract.Invariant(this.Token != null);
-		}
-#endif
-	}
-}
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivingTokenEventArgs.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivingTokenEventArgs.cs
deleted file mode 100644
index 6de2ef0..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/ReceivingTokenEventArgs.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="ReceivingTokenEventArgs.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-
-namespace DotNetOpenAuth.InfoCard {
-	using System;
-	using System.Collections.Generic;
-	using System.Diagnostics.CodeAnalysis;
-	using System.IdentityModel.Tokens;
-	using System.Security.Cryptography.X509Certificates;
-	using Validation;
-
-	/// <summary>
-	/// Arguments for the <see cref="InfoCardSelector.ReceivingToken"/> event.
-	/// </summary>
-	public class ReceivingTokenEventArgs : EventArgs {
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ReceivingTokenEventArgs"/> class.
-		/// </summary>
-		/// <param name="tokenXml">The raw token XML, prior to any decryption.</param>
-		internal ReceivingTokenEventArgs(string tokenXml) {
-			Requires.NotNull(tokenXml, "tokenXml");
-
-			this.TokenXml = tokenXml;
-			this.IsEncrypted = Token.IsEncrypted(this.TokenXml);
-			this.DecryptingTokens = new List<SecurityToken>();
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether the token is encrypted.
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> if the token is encrypted; otherwise, <c>false</c>.
-		/// </value>
-		public bool IsEncrypted { get; private set; }
-
-		/// <summary>
-		/// Gets the raw token XML, prior to any decryption.
-		/// </summary>
-		public string TokenXml { get; private set; }
-
-		/// <summary>
-		/// Gets or sets a value indicating whether processing
-		/// this token should be canceled.
-		/// </summary>
-		/// <value><c>true</c> if cancel; otherwise, <c>false</c>.</value>
-		/// <remarks>
-		/// If set the <c>true</c>, the <see cref="InfoCardSelector.ReceivedToken"/>
-		/// event will never be fired.
-		/// </remarks>
-		public bool Cancel { get; set; }
-
-		/// <summary>
-		/// Gets a list where security tokens such as X.509 certificates may be
-		/// added to be used for token decryption.
-		/// </summary>
-		internal IList<SecurityToken> DecryptingTokens { get; private set; }
-
-		/// <summary>
-		/// Adds a security token that may be used to decrypt the incoming token.
-		/// </summary>
-		/// <param name="securityToken">The security token.</param>
-		public void AddDecryptingToken(SecurityToken securityToken) {
-			Requires.NotNull(securityToken, "securityToken");
-			this.DecryptingTokens.Add(securityToken);
-		}
-
-		/// <summary>
-		/// Adds an X.509 certificate with a private key that may be used to decrypt the incoming token.
-		/// </summary>
-		/// <param name="certificate">The certificate.</param>
-		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "False positive")]
-		public void AddDecryptingToken(X509Certificate2 certificate) {
-			Requires.NotNull(certificate, "certificate");
-			Requires.That(certificate.HasPrivateKey, "certificate", "requires private key");
-			var cert = new X509SecurityToken(certificate);
-			try {
-				this.AddDecryptingToken(cert);
-			} catch {
-				cert.Dispose();
-				throw;
-			}
-		}
-
-#if CONTRACTS_FULL
-		/// <summary>
-		/// Verifies conditions that should be true for any valid state of this object.
-		/// </summary>
-		[SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Called by code contracts.")]
-		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Called by code contracts.")]
-		[ContractInvariantMethod]
-		private void ObjectInvariant() {
-			Contract.Invariant(this.TokenXml != null);
-			Contract.Invariant(this.DecryptingTokens != null);
-		}
-#endif
-	}
-}
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/SupportingScript.js b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/SupportingScript.js
deleted file mode 100644
index a883cd7..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/SupportingScript.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*jslint white: true, onevar: true, browser: true, undef: true, nomen: true, plusplus: true, bitwise: true, regexp: true, strict: true, newcap: true, immed: true */
-"use strict";
-document.infoCard = {
-	isSupported: function () {
-		/// <summary>
-		/// Determines if information cards are supported by the 
-		/// browser.
-		/// </summary>
-		/// <returns>
-		/// true-if the browser supports information cards.
-		///</returns>
-		var IEVer, embed, x, event;
-
-		IEVer = -1;
-		if (navigator.appName === 'Microsoft Internet Explorer') {
-			if (new RegExp("MSIE ([0-9]{1,}[\\.0-9]{0,})").exec(navigator.userAgent) !== null) {
-				IEVer = parseFloat(RegExp.$1);
-			}
-		}
-
-		// Look for IE 7+. 
-		if (IEVer >= 7) {
-			embed = document.createElement("object");
-			embed.type = "application/x-informationcard";
-			return embed.issuerPolicy !== undefined && embed.isInstalled;
-		}
-
-		// not IE (any version)
-		if (IEVer < 0 && navigator.mimeTypes && navigator.mimeTypes.length) {
-			// check to see if there is a mimeType handler. 
-			x = navigator.mimeTypes['application/x-informationcard'];
-			if (x && x.enabledPlugin) {
-				return true;
-			}
-
-			// check for the IdentitySelector event handler is there. 
-			if (document.addEventListener) {
-				event = document.createEvent("Events");
-				event.initEvent("IdentitySelectorAvailable", true, true);
-				top.dispatchEvent(event);
-
-				if (top.IdentitySelectorAvailable === true) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	},
-
-	activate: function (selectorId, hiddenFieldName) {
-		var selector, hiddenField;
-		selector = document.getElementById(selectorId);
-		hiddenField = document.getElementsByName(hiddenFieldName)[0];
-		try {
-			hiddenField.value = selector.value;
-		} catch (e) {
-			// Selector was canceled
-			return false;
-		}
-		if (hiddenField.value == 'undefined') { // really the string, not === undefined
-			// We're dealing with a bad FireFox selector plugin.
-			// Just add the control to the form by setting its name property and submit to activate.
-			selector.name = hiddenFieldName;
-			hiddenField.parentNode.removeChild(hiddenField);
-			return true;
-		}
-		return true;
-	},
-
-	hideStatic: function (divName) {
-		var div = document.getElementById(divName);
-		if (div) {
-			div.style.visibility = 'hidden';
-		}
-	},
-
-	showStatic: function (divName) {
-		var div = document.getElementById(divName);
-		if (div) {
-			div.style.visibility = 'visible';
-		}
-	},
-
-	hideDynamic: function (divName) {
-		var div = document.getElementById(divName);
-		if (div) {
-			div.style.display = 'none';
-		}
-	},
-
-	showDynamic: function (divName) {
-		var div = document.getElementById(divName);
-		if (div) {
-			div.style.display = '';
-		}
-	},
-
-	checkDynamic: function (controlDiv, unsupportedDiv) {
-		if (this.isSupported()) {
-			this.showDynamic(controlDiv);
-			if (unsupportedDiv) {
-				this.hideDynamic(unsupportedDiv);
-			}
-		} else {
-			this.hideDynamic(controlDiv);
-			if (unsupportedDiv) {
-				this.showDynamic(unsupportedDiv);
-			}
-		}
-	},
-
-	checkStatic: function (controlDiv, unsupportedDiv) {
-		if (this.isSupported()) {
-			this.showStatic(controlDiv);
-			if (unsupportedDiv) {
-				this.hideStatic(unsupportedDiv);
-			}
-		} else {
-			this.hideStatic(controlDiv);
-			if (unsupportedDiv) {
-				this.showDynamic(unsupportedDiv);
-			}
-		}
-	}
-};
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/TokenProcessingErrorEventArgs.cs b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/TokenProcessingErrorEventArgs.cs
deleted file mode 100644
index 104df15..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/TokenProcessingErrorEventArgs.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-//-----------------------------------------------------------------------
-// <copyright file="TokenProcessingErrorEventArgs.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
-// </copyright>
-//-----------------------------------------------------------------------
-namespace DotNetOpenAuth.InfoCard {
-	using System;
-	using System.Diagnostics.CodeAnalysis;
-	using Validation;
-
-	/// <summary>
-	/// Arguments for the <see cref="InfoCardSelector.TokenProcessingError"/> event.
-	/// </summary>
-	public class TokenProcessingErrorEventArgs : EventArgs {
-		/// <summary>
-		/// Initializes a new instance of the <see cref="TokenProcessingErrorEventArgs"/> class.
-		/// </summary>
-		/// <param name="tokenXml">The token XML.</param>
-		/// <param name="exception">The exception.</param>
-		internal TokenProcessingErrorEventArgs(string tokenXml, Exception exception) {
-			Requires.NotNull(tokenXml, "tokenXml");
-			Requires.NotNull(exception, "exception");
-			this.TokenXml = tokenXml;
-			this.Exception = exception;
-		}
-
-		/// <summary>
-		/// Gets the raw token XML.
-		/// </summary>
-		public string TokenXml { get; private set; }
-
-		/// <summary>
-		/// Gets the exception that was generated while processing the token.
-		/// </summary>
-		public Exception Exception { get; private set; }
-
-#if CONTRACTS_FULL
-		/// <summary>
-		/// Verifies conditions that should be true for any valid state of this object.
-		/// </summary>
-		[SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Called by code contracts.")]
-		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Called by code contracts.")]
-		[ContractInvariantMethod]
-		private void ObjectInvariant() {
-			Contract.Invariant(this.TokenXml != null);
-			Contract.Invariant(this.Exception != null);
-		}
-#endif
-	}
-}
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_114x80.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_114x80.png
deleted file mode 100644
index 6dba25f..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_114x80.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_14x10.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_14x10.png
deleted file mode 100644
index d63575d..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_14x10.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_214x150.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_214x150.png
deleted file mode 100644
index 71ebc7e..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_214x150.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_23x16.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_23x16.png
deleted file mode 100644
index 9dbea9f..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_23x16.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_300x210.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_300x210.png
deleted file mode 100644
index e805b9d..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_300x210.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_34x24.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_34x24.png
deleted file mode 100644
index b863f64..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_34x24.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_365x256.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_365x256.png
deleted file mode 100644
index 30092c5..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_365x256.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_41x29.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_41x29.png
deleted file mode 100644
index d3c71ae..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_41x29.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_50x35.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_50x35.png
deleted file mode 100644
index 62ff78b..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_50x35.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_60x42.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_60x42.png
deleted file mode 100644
index 8e920c5..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_60x42.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_71x50.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_71x50.png
deleted file mode 100644
index 9e8f7fb..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_71x50.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_81x57.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_81x57.png
deleted file mode 100644
index 48d62b2..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_81x57.png
+++ /dev/null
diff --git a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_92x64.png b/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_92x64.png
deleted file mode 100644
index 388e497..0000000
--- a/src/DotNetOpenAuth.InfoCard.UI/InfoCard/infocard_92x64.png
+++ /dev/null