diff --git a/app/controllers/schedules_controller.rb b/app/controllers/schedules_controller.rb
index 5f68c27c..fd60f7bd 100644
--- a/app/controllers/schedules_controller.rb
+++ b/app/controllers/schedules_controller.rb
@@ -8,49 +8,7 @@ class SchedulesController < ApplicationController
   before_action :load_withdrawn_event_schedules, only: [:show, :events]
 
   def show
-    event_schedules = @program.selected_event_schedules(
-      includes: [{ event: %i[event_type speakers submitter] }]
-    )
-
-    unless event_schedules
-      redirect_to events_conference_schedule_path(@conference.short_title)
-      return
-    end
-
-    respond_to do |format|
-      format.xml do
-        @events_xml = event_schedules.map(&:event).group_by{ |event| event.time.to_date } if event_schedules
-      end
-      format.ics do
-        cal = Icalendar::Calendar.new
-        cal = icalendar_proposals(cal, event_schedules.map(&:event), @conference)
-        cal.publish
-        render inline: cal.to_ical
-      end
-
-      format.html do
-        @rooms = @conference.venue.rooms.order(:name) if @conference.venue
-        @dates = @conference.start_date..@conference.end_date
-        @step_minutes = @program.schedule_interval.minutes
-        @conf_start = @conference.start_hour
-        @conf_period = @conference.end_hour - @conf_start
-
-        # the schedule takes you to today if it is a date of the schedule
-        @current_day = @conference.current_conference_day
-        @day = @current_day.present? ? @current_day : @dates.first
-        if @current_day
-          # the schedule takes you to the current time if it is beetween the start and the end time.
-          @hour_column = @conference.hours_from_start_time(@conf_start, @conference.end_hour)
-        end
-        # Ids of the @event_schedules of confrmed self_organized tracks along with the selected_schedule_id
-        @selected_schedules_ids = [@conference.program.selected_schedule_id]
-        @conference.program.tracks.self_organized.confirmed.each do |track|
-          @selected_schedules_ids << track.selected_schedule_id
-        end
-        @selected_schedules_ids.compact!
-        @event_schedules_by_room_id = event_schedules.select { |s| @selected_schedules_ids.include?(s.schedule_id) }.group_by(&:room_id)
-      end
-    end
+    redirect_to events_conference_schedule_path(@conference.short_title)
   end
 
   def events
diff --git a/app/views/schedules/_schedule_tabs.html.haml b/app/views/schedules/_schedule_tabs.html.haml
index 0317f8bc..aadd6217 100644
--- a/app/views/schedules/_schedule_tabs.html.haml
+++ b/app/views/schedules/_schedule_tabs.html.haml
@@ -1,7 +1,8 @@
 %div{ role: "tabpanel" }
   / Nav tabs
   %ul.nav.nav-tabs{ role: "tablist" }
-    %li{ class: "schedule #{ 'active' if active == 'schedule' }", role: "presentation" }
-      = link_to('Schedule', conference_schedule_path(@conference.short_title))
+    - unless active == 'program'
+      %li{ class: "schedule #{ 'active' if active == 'schedule' }", role: "presentation" }
+        = link_to('Schedule', conference_schedule_path(@conference.short_title))
     %li{ class: "program #{ 'active' if active == 'program' }", role: "presentation" }
       = link_to('All events', events_conference_schedule_path(@conference.short_title))