diff --git a/includes/widgets/displayfeaturedimagegenesis-author-widget.php b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
index 81899ca..2b5da4f 100644
--- a/includes/widgets/displayfeaturedimagegenesis-author-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-author-widget.php
@@ -11,11 +11,6 @@
 
 class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 
-	/**
-	 * @var $form_class \DisplayFeaturedImageGenesisWidgetsForm
-	 */
-	protected $form_class;
-
 	/**
 	 * Constructor. Set the default widget options and create widget.
 	 */
@@ -197,7 +192,8 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 	 * @return array
 	 */
 	public function get_fields( $new_instance ) {
-		$form = $this->get_form_class( $new_instance );
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, $new_instance );
+
 		return array_merge(
 			$form->get_author_image_fields(),
 			$this->get_gravatar_fields(),
@@ -215,7 +211,7 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 
 		// Merge with defaults
 		$instance = wp_parse_args( (array) $instance, $this->defaults() );
-		$form     = $this->get_form_class( $instance );
+		$form     = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
 
 		$form->do_text( $instance, array(
 			'id'    => 'title',
@@ -246,22 +242,6 @@ class Display_Featured_Image_Genesis_Author_Widget extends WP_Widget {
 		) );
 	}
 
-	/**
-	 * Get the plugin widget forms class.
-	 *
-	 * @param array $instance
-	 *
-	 * @return \DisplayFeaturedImageGenesisWidgetsForm
-	 */
-	protected function get_form_class( $instance = array() ) {
-		if ( isset( $this->form_class ) ) {
-			return $this->form_class;
-		}
-		$this->form_class = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
-
-		return $this->form_class;
-	}
-
 	/**
 	 * Get the gravatar fields.
 	 *
diff --git a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
index e6b34d6..f60bc23 100644
--- a/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-cpt-archive-widget.php
@@ -18,11 +18,6 @@
  */
 class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 
-	/**
-	 * @var $form_class \DisplayFeaturedImageGenesisWidgetsForm
-	 */
-	protected $form_class;
-
 	/**
 	 * Constructor. Set the default widget options and create widget.
 	 *
@@ -310,10 +305,13 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 
 	/**
 	 * Get all widget fields.
+	 *
+	 * @param array $instance
+	 *
 	 * @return array
 	 */
 	public function get_fields( $instance = array() ) {
-		$form = $this->get_form_class( $instance );
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
 
 		return array_merge(
 			$this->get_post_type_fields(),
@@ -334,7 +332,7 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 
 		// Merge with defaults
 		$instance = wp_parse_args( (array) $instance, $this->defaults() );
-		$form     = $this->get_form_class( $instance );
+		$form     = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
 
 		$form->do_text( $instance, array(
 			'id'    => 'title',
@@ -407,22 +405,6 @@ class Display_Featured_Image_Genesis_Widget_CPT extends WP_Widget {
 		);
 	}
 
-	/**
-	 * Get the plugin widget forms class.
-	 *
-	 * @param array $instance
-	 *
-	 * @return \DisplayFeaturedImageGenesisWidgetsForm
-	 */
-	protected function get_form_class( $instance = array() ) {
-		if ( isset( $this->form_class ) ) {
-			return $this->form_class;
-		}
-		$this->form_class = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
-
-		return $this->form_class;
-	}
-
 	/**
 	 * Get the public registered post types on the site.
 	 *
diff --git a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
index 6b6a5c9..71d1119 100644
--- a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
@@ -18,11 +18,6 @@
  */
 class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 
-	/**
-	 * @var $form_class \DisplayFeaturedImageGenesisWidgetsForm
-	 */
-	protected $form_class;
-
 	/**
 	 * Constructor. Set the default widget options and create widget.
 	 *
@@ -219,10 +214,13 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 
 	/**
 	 * Get all widget fields.
+	 *
+	 * @param array $instance
+	 *
 	 * @return array
 	 */
 	public function get_fields( $instance = array() ) {
-		$form = $this->get_form_class( $instance );
+		$form = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
 
 		return array_merge(
 			$form->get_text_fields(),
@@ -245,7 +243,7 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 
 		// Merge with defaults
 		$instance = wp_parse_args( (array) $instance, $this->defaults() );
-		$form     = $this->get_form_class( $instance );
+		$form     = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
 
 		$form->do_text( $instance, array(
 			'id'    => 'title',
@@ -277,22 +275,6 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 		echo '</div>';
 	}
 
-	/**
-	 * Get the plugin widget forms class.
-	 *
-	 * @param array $instance
-	 *
-	 * @return \DisplayFeaturedImageGenesisWidgetsForm
-	 */
-	protected function get_form_class( $instance = array() ) {
-		if ( isset( $this->form_class ) ) {
-			return $this->form_class;
-		}
-		$this->form_class = new DisplayFeaturedImageGenesisWidgetsForm( $this, $instance );
-
-		return $this->form_class;
-	}
-
 	/**
 	 * @param $instance
 	 *