diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 8e89a8aa826b..aeb04ea8e1e8 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -41,8 +41,7 @@ def project_settings_tabs
             {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_work_package_category_plural},
             {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
             {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
-            {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities},
-            {:name => 'timelines', :action => :manage_project_configuration, :partial => 'projects/settings/timelines', :label => :'timelines.settings'}
+            {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
             ]
     tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
   end
diff --git a/app/views/projects/settings/_timelines.html.erb b/app/views/projects/settings/_timelines.html.erb
deleted file mode 100644
index 2d5476d4b574..000000000000
--- a/app/views/projects/settings/_timelines.html.erb
+++ /dev/null
@@ -1,78 +0,0 @@
-<%#-- copyright
-OpenProject is a project management system.
-Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2013 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-See doc/COPYRIGHT.rdoc for more details.
-
-++#%>
-
-<% extend TimelinesHelper %>
-<%= header_tags %>
-
-<h3><%= Type.model_name.human %></h3>
-
-<%= form_tag(:controller => "/projects", :action => "types", :id => @project) do %>
-  <table class='list'>
-    <thead>
-      <tr>
-        <th><%= Type.human_attribute_name(:is_default) %></th>
-        <th><%= Type.human_attribute_name(:active) %></th>
-        <th><%= Type.human_attribute_name(:name) %></th>
-        <th><%= Type.human_attribute_name(:in_aggregation) %></th>
-      </tr>
-    </thead>
-
-    <tbody>
-      <% Type.all.each do |type| %>
-        <tr class="<%= cycle('odd', 'even', :name => "pet_table") %>">
-          <td class='center'>
-            <%= checked_image(type.enabled_in?(@project)) %>
-          </td>
-          <td class='center'>
-            <%= check_box_tag "project[planning_element_type_ids][]",
-                              type.id,
-                              @project.types.include?(type),
-                              :id => "project_planning_element_type_ids_#{type.id}" %>
-            <label class='hidden-for-sighted' for="project_planning_element_type_ids_<%= type.id %>">
-              <%= l('timelines.enable_planning_element_in_project', :type => type.name) %>
-            </label>
-          </td>
-          <td>
-            <label for="project_planning_element_type_ids_<%= type.id %>">
-              <%= icon_for_type(type) %>
-              <%=h type.name %>
-            </label>
-          </td>
-          <td class='center'>
-            <%= checked_image(type.in_aggregation) %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-
-  <p><%= submit_tag l(:button_save) %></p>
-<% end %>
-
-<br/>
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 5c84dfebcd29..170b6612e8ca 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -29,6 +29,8 @@ See doc/COPYRIGHT.rdoc for more details.
 
 # Changelog
 
+* `#1717` [Timelines] Project Settings Tab Unnecessary and Buggy 
+
 ## 3.0.0pre17
 
 * `#1323` Wrong Calendarweek in Datepicker, replaced built in datepicker with jQuery UI datepicker