diff --git a/includes/widgets/class-sp-widget-countdown.php b/includes/widgets/class-sp-widget-countdown.php
index 38647859..df4547fe 100644
--- a/includes/widgets/class-sp-widget-countdown.php
+++ b/includes/widgets/class-sp-widget-countdown.php
@@ -14,35 +14,35 @@ class SP_Widget_Countdown extends WP_Widget {
 		echo $before_widget;
 		if ( $title )
 			echo $before_title . $title . $after_title;
-		echo sportspress_countdown( $id, array( 'show_league' => $show_league ) );
+		sp_get_template( 'countdown.php', array( 'id' => $id, 'show_league' => $show_league ) );
 		echo $after_widget;
 	}
 
 	function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
 		$instance['title'] = strip_tags($new_instance['title']);
-		$instance['event'] = intval($new_instance['event']);
+		$instance['id'] = intval($new_instance['id']);
 		$instance['show_league'] = intval($new_instance['show_league']);
 
 		return $instance;
 	}
 
 	function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'event' => '', 'show_league' => false ) );
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'id' => '', 'show_league' => false ) );
 		$title = strip_tags($instance['title']);
-		$event = intval($instance['event']);
+		$id = intval($instance['id']);
 		$show_league = intval($instance['show_league']);
 ?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'sportspress' ); ?></label>
 		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo esc_attr($title); ?>" /></p>
 
-		<p><label for="<?php echo $this->get_field_id('event'); ?>"><?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?></label>
+		<p><label for="<?php echo $this->get_field_id('id'); ?>"><?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?></label>
 		<?php
 		$args = array(
 			'post_type' => 'sp_event',
-			'name' => $this->get_field_name('event'),
-			'id' => $this->get_field_id('event'),
-			'selected' => $event,
+			'name' => $this->get_field_name('id'),
+			'id' => $this->get_field_id('id'),
+			'selected' => $id,
 			'show_option_all' => __( '(Auto)', 'sportspress' ),
 			'values' => 'ID',
 			'class' => 'widefat',
@@ -60,4 +60,5 @@ class SP_Widget_Countdown extends WP_Widget {
 <?php
 	}
 }
-add_action( 'widgets_init', create_function( '', 'return register_widget( "SP_Widget_Countdown" );' ) );
+
+register_widget( 'SP_Widget_Countdown' );
diff --git a/includes/widgets/class-sp-widget-event-calendar.php b/includes/widgets/class-sp-widget-event-calendar.php
index 90f72d3d..308d98e5 100644
--- a/includes/widgets/class-sp-widget-event-calendar.php
+++ b/includes/widgets/class-sp-widget-event-calendar.php
@@ -60,4 +60,5 @@ class SP_Widget_Event_Calendar extends WP_Widget {
 <?php
 	}
 }
-add_action( 'widgets_init', create_function( '', 'return register_widget( "SP_Widget_Event_Calendar" );' ) );
\ No newline at end of file
+
+register_widget( 'SP_Widget_Event_Calendar' );
diff --git a/includes/widgets/class-sp-widget-event-list.php b/includes/widgets/class-sp-widget-event-list.php
index 20c3f111..ec209f0b 100644
--- a/includes/widgets/class-sp-widget-event-list.php
+++ b/includes/widgets/class-sp-widget-event-list.php
@@ -78,4 +78,5 @@ class SP_Widget_Event_List extends WP_Widget {
 <?php
 	}
 }
-add_action( 'widgets_init', create_function( '', 'return register_widget( "SP_Widget_Event_List" );' ) );
\ No newline at end of file
+
+register_widget( 'SP_Widget_Event_List' );
diff --git a/includes/widgets/class-sp-widget-league-table.php b/includes/widgets/class-sp-widget-league-table.php
index 9741f7ca..15306a3b 100644
--- a/includes/widgets/class-sp-widget-league-table.php
+++ b/includes/widgets/class-sp-widget-league-table.php
@@ -95,4 +95,5 @@ class SP_Widget_League_Table extends WP_Widget {
 <?php
 	}
 }
-add_action( 'widgets_init', create_function( '', 'return register_widget( "SP_Widget_League_Table" );' ) );
\ No newline at end of file
+
+register_widget( 'SP_Widget_League_Table' );
diff --git a/includes/widgets/class-sp-widget-player-gallery.php b/includes/widgets/class-sp-widget-player-gallery.php
index 9776ecfd..f07f1a73 100644
--- a/includes/widgets/class-sp-widget-player-gallery.php
+++ b/includes/widgets/class-sp-widget-player-gallery.php
@@ -105,4 +105,5 @@ class SP_Widget_Player_Gallery extends WP_Widget {
 <?php
 	}
 }
-add_action( 'widgets_init', create_function( '', 'return register_widget( "SP_Widget_Player_Gallery" );' ) );
\ No newline at end of file
+
+register_widget( 'SP_Widget_Player_Gallery' );
diff --git a/includes/widgets/class-sp-widget-player-list.php b/includes/widgets/class-sp-widget-player-list.php
index 2acfd6c6..99f0dd9b 100644
--- a/includes/widgets/class-sp-widget-player-list.php
+++ b/includes/widgets/class-sp-widget-player-list.php
@@ -123,4 +123,5 @@ class SP_Widget_Player_list extends WP_Widget {
 <?php
 	}
 }
-add_action( 'widgets_init', create_function( '', 'return register_widget( "SP_Widget_Player_list" );' ) );
\ No newline at end of file
+
+register_widget( 'SP_Widget_Player_list' );
diff --git a/sportspress.php b/sportspress.php
index e1108425..14503367 100644
--- a/sportspress.php
+++ b/sportspress.php
@@ -222,10 +222,6 @@ final class SportsPress {
 			include_once( 'includes/admin/class-sp-admin.php' );
 		}
 
-		if ( defined( 'DOING_AJAX' ) ) {
-			$this->ajax_includes();
-		}
-
 		if ( ! is_admin() ) {
 			$this->frontend_includes();
 		}
@@ -282,13 +278,6 @@ final class SportsPress {
 		include_once( 'admin/hooks/register-activation-hook.php' );
 	}
 
-	/**
-	 * Include required ajax files.
-	 */
-	public function ajax_includes() {
-		include_once( 'includes/class-sp-ajax.php' );					// Ajax functions for admin and the front-end
-	}
-
 	/**
 	 * Include required frontend files.
 	 */
@@ -307,6 +296,7 @@ final class SportsPress {
 	 * Include core widgets
 	 */
 	public function include_widgets() {
+		//include_once( 'includes/abstracts/abstract-wc-widget.php' );
 		include_once( 'includes/widgets/class-sp-widget-countdown.php' );
 		include_once( 'includes/widgets/class-sp-widget-event-calendar.php' );
 		include_once( 'includes/widgets/class-sp-widget-event-list.php' );