diff --git a/lms/static/coffee/src/discussion/discussion_filter.coffee b/lms/static/coffee/src/discussion/discussion_filter.coffee
new file mode 100644
index 0000000000..6b3ab03689
--- /dev/null
+++ b/lms/static/coffee/src/discussion/discussion_filter.coffee
@@ -0,0 +1,28 @@
+class @DiscussionFilter
+  @filterDrop: (e) ->
+    $drop = $(e.target).parents('.topic_menu_wrapper, .browse-topic-drop-menu-wrapper')
+    query = $(e.target).val()
+    $items = $drop.find('a')
+
+    if(query.length == 0)
+      $items.removeClass('hidden')
+      return;
+
+    $items.addClass('hidden')
+    $items.each (i) ->
+      thisText = $(this).not('.unread').text()
+      $(this).parents('ul').siblings('a').not('.unread').each (i) ->
+        thisText = thisText  + ' ' + $(this).text();
+
+      test = true
+      terms = thisText.split(' ')
+
+      if(thisText.toLowerCase().search(query.toLowerCase()) == -1)
+        test = false
+
+      if(test)
+        $(this).removeClass('hidden')
+        # show children
+        $(this).parent().find('a').removeClass('hidden');
+        # show parents
+        $(this).parents('ul').siblings('a').removeClass('hidden');
diff --git a/lms/static/coffee/src/discussion/discussion_router.coffee b/lms/static/coffee/src/discussion/discussion_router.coffee
index b2e41cd5af..a5219a68b9 100644
--- a/lms/static/coffee/src/discussion/discussion_router.coffee
+++ b/lms/static/coffee/src/discussion/discussion_router.coffee
@@ -14,6 +14,9 @@ if Backbone?
 
         @newPostView = new NewPostView(el: $(".new-post-article"), collection: @discussion)
         @nav.on "thread:created", @navigateToThread
+        @newPost = $('.new-post-article')
+        $('.new-post-btn').bind "click", @showNewPost
+        $('.new-post-cancel').bind "click", @hideNewPost
 
     allThreads: ->
       @nav.updateSidebar()
@@ -43,3 +46,10 @@ if Backbone?
 
     navigateToAllThreads: =>
       @navigate("", trigger: true)
+
+    showNewPost: (event) =>
+      @newPost.slideDown(300)
+      $('.new-post-title').focus()
+
+    hideNewPost: (event) =>
+      @newPost.slideUp(300)
diff --git a/lms/static/coffee/src/discussion/tooltip_manager.coffee b/lms/static/coffee/src/discussion/tooltip_manager.coffee
new file mode 100644
index 0000000000..695ad52e3d
--- /dev/null
+++ b/lms/static/coffee/src/discussion/tooltip_manager.coffee
@@ -0,0 +1,47 @@
+$ ->
+  new TooltipManager
+
+class @TooltipManager
+  constructor: () ->
+    @$body = $('body')
+    @$tooltip = $('<div class="tooltip"></div>')
+    @$body.delegate '[data-tooltip]',
+      'mouseover': @showTooltip,
+      'mousemove': @moveTooltip,
+      'mouseout': @hideTooltip,
+      'click': @hideTooltip
+
+  showTooltip: (e) =>
+    tooltipText = $(e.target).attr('data-tooltip')
+    @$tooltip.html(tooltipText)
+    @$body.append(@$tooltip)
+    $(e.target).children().css('pointer-events', 'none')
+
+    tooltipCoords =
+      x: e.pageX - (@$tooltip.outerWidth() / 2)
+      y: e.pageY - (@$tooltip.outerHeight() + 15)
+
+    @$tooltip.css
+    'left': tooltipCoords.x,
+    'top': tooltipCoords.y
+
+    @tooltipTimer = setTimeout ()=>
+      @$tooltip.show().css('opacity', 1)
+
+      @tooltipTimer = setTimeout ()=>
+        @hideTooltip()
+      , 3000
+    , 500
+
+  moveTooltip: (e) =>
+    tooltipCoords =
+      x: e.pageX - (@$tooltip.outerWidth() / 2)
+      y: e.pageY - (@$tooltip.outerHeight() + 15)
+
+    @$tooltip.css
+      'left': tooltipCoords.x
+      'top': tooltipCoords.y
+
+  hideTooltip: (e) =>
+    @$tooltip.hide().css('opacity', 0)
+    clearTimeout(@tooltipTimer)
diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index 6b8abbdc91..d998763f50 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -9,6 +9,7 @@ if Backbone?
       "click .browse-topic-drop-search-input": "ignoreClick"
       "click .post-list .list-item a": "threadSelected"
       "click .post-list .more-pages a": "loadMorePages"
+      'keyup .browse-topic-drop-search-input': DiscussionFilter.filterDrop
 
     initialize: ->
       @displayedCollection = new Discussion(@collection.models, pages: @collection.pages)
diff --git a/lms/static/coffee/src/discussion/views/new_post_view.coffee b/lms/static/coffee/src/discussion/views/new_post_view.coffee
index 2400a3b18e..1c49fdbc8e 100644
--- a/lms/static/coffee/src/discussion/views/new_post_view.coffee
+++ b/lms/static/coffee/src/discussion/views/new_post_view.coffee
@@ -21,6 +21,7 @@ if Backbone?
           "click  .topic_dropdown_button":    "toggleTopicDropdown"
           "click  .topic_menu_wrapper":       "setTopic"
           "click  .topic_menu_search":        "ignoreClick"
+          "keyup .form-topic-drop-search-input": DiscussionFilter.filterDrop
 
       # Because we want the behavior that when the body is clicked the menu is
       # closed, we need to ignore clicks in the search field and stop propagation.
@@ -120,9 +121,6 @@ if Backbone?
           anonymous_to_peers = false || @$("input.discussion-anonymous-to-peers").is(":checked")
           follow             = false || @$("input.discussion-follow").is(":checked")
 
-          $formTopicDropBtn.bind('click', showFormTopicDrop)
-          $formTopicDropMenu.bind('click', setFormTopic)
-
           url = DiscussionUtil.urlFor('create_thread', @topicId)
 
           DiscussionUtil.safeAjax
diff --git a/lms/static/js/discussions-temp.js b/lms/static/js/discussions-temp.js
deleted file mode 100644
index dd6af6ef14..0000000000
--- a/lms/static/js/discussions-temp.js
+++ /dev/null
@@ -1,350 +0,0 @@
-var $body;
-var $browse;
-var $search;
-var $searchField;
-var $topicDrop;
-var $currentBoard;
-var $tooltip;
-var $newPost;
-var $thread;
-var $sidebar;
-var $sidebarWidthStyles;
-var $formTopicDropBtn;
-var $formTopicDropMenu;
-var $postListWrapper;
-var $dropFilter;
-var $topicFilter;
-var $discussionBody;
-var sidebarWidth;
-var sidebarHeight;
-var sidebarHeaderHeight;
-var sidebarXOffset;
-var scrollTop;
-var discussionsBodyTop;
-var discussionsBodyBottom;
-var tooltipTimer;
-var tooltipCoords;
-var SIDEBAR_PADDING = 10;
-var SIDEBAR_HEADER_HEIGHT = 87;
-
-
-$(document).ready(function() {
-	$body = $('body');
-	//$browse = $('.browse-search .browse');
-	//$search = $('.browse-search .search');
-	$searchField = $('.post-search-field');
-	//$topicDrop = $('.browse-topic-drop-menu-wrapper');
-	$currentBoard = $('.current-board');
-	$tooltip = $('<div class="tooltip"></div>');
-	$newPost = $('.new-post-article');
-	$sidebar = $('.sidebar');
-	$discussionBody = $('.discussion-body');
-	$postListWrapper = $('.post-list-wrapper');
-	$formTopicDropBtn = $('.new-post-article .form-topic-drop-btn');
-	$formTopicDropMenu = $('.new-post-article .form-topic-drop-menu-wrapper');
-	// $dropFilter = $('.browse-topic-drop-search-input');
-	// $topicFilter = $('.topic-drop-search-input');
-	$sidebarWidthStyles = $('<style></style>');
-	$body.append($sidebarWidthStyles);
-
-	sidebarWidth = $('.sidebar').width();
-	sidebarXOffset = $sidebar.offset().top;
-
-	//$browse.bind('click', showTopicDrop);
-	//$search.bind('click', showSearch);
-	// $topicDrop.bind('click', setTopic);
-	$formTopicDropBtn.bind('click', showFormTopicDrop);
-	$formTopicDropMenu.bind('click', setFormTopic);
-	$('.new-post-btn').bind('click', newPost);
-	$('.new-post-cancel').bind('click', closeNewPost);
-
-	$body.delegate('[data-tooltip]', {
-		'mouseover': showTooltip,
-		'mousemove': moveTooltip,
-		'mouseout': hideTooltip,
-		'click': hideTooltip
-	});
-
-	$body.delegate('.browse-topic-drop-search-input, .form-topic-drop-search-input', 'keyup', filterDrop);
-});
-
-function filterDrop(e) {
-	/*
-	 * multiple queries
-	 */
-
-	// var $drop = $(e.target).parents('.form-topic-drop-menu-wrapper, .browse-topic-drop-menu-wrapper');
-	// var queries = $(this).val().split(' ');
-	// var $items = $drop.find('a');
-
-	// if(queries.length == 0) {
-	// 	$items.show();
-	// 	return;
-	// }
-
-	// $items.hide();
-	// $items.each(function(i) {
-	// 	var thisText = $(this).children().not('.unread').text();
-	// 	$(this).parents('ul').siblings('a').not('.unread').each(function(i) {
-	// 		thisText = thisText  + ' ' + $(this).text();
-	// 	});
-
-	// 	var test = true;
-	// 	var terms = thisText.split(' ');
-
-	// 	for(var i = 0; i < queries.length; i++) {
-	// 		if(thisText.toLowerCase().search(queries[i].toLowerCase()) == -1) {
-	// 			test = false;
-	// 		}
-	// 	}
-
-	// 	if(test) {
-	// 		$(this).show();
-
-	// 		// show children
-	// 		$(this).parent().find('a').show();
-
-	// 		// show parents
-	// 		$(this).parents('ul').siblings('a').show();
-	// 	}
-	// });
-
-
-
-	/*
-	 * single query
-	 */
-
-	var $drop = $(e.target).parents('.topic_menu_wrapper, .browse-topic-drop-menu-wrapper');
-	var query = $(this).val();
-	var $items = $drop.find('a');
-
-	if(query.length == 0) {
-		$items.removeClass('hidden');
-		return;
-	}
-
-	$items.addClass('hidden');
-	$items.each(function(i) {
-		var thisText = $(this).not('.unread').text();
-		$(this).parents('ul').siblings('a').not('.unread').each(function(i) {
-			thisText = thisText  + ' ' + $(this).text();
-		});
-
-		var test = true;
-		var terms = thisText.split(' ');
-
-		if(thisText.toLowerCase().search(query.toLowerCase()) == -1) {
-			test = false;
-		}
-
-		if(test) {
-			$(this).removeClass('hidden');
-
-			// show children
-			$(this).parent().find('a').removeClass('hidden');
-
-			// show parents
-			$(this).parents('ul').siblings('a').removeClass('hidden');
-		}
-	});
-}
-
-function showTooltip(e) {
-	var tooltipText = $(this).attr('data-tooltip');
-	$tooltip.html(tooltipText);
-	$body.append($tooltip);
-	$(this).children().css('pointer-events', 'none');
-
-	tooltipCoords = {
-		x: e.pageX - ($tooltip.outerWidth() / 2),
-		y: e.pageY - ($tooltip.outerHeight() + 15)
-	};
-
-	$tooltip.css({
-		'left': tooltipCoords.x,
-		'top': tooltipCoords.y
-	});
-
-	tooltipTimer = setTimeout(function() {
-		$tooltip.show().css('opacity', 1);
-
-		tooltipTimer = setTimeout(function() {
-			hideTooltip();
-		}, 3000);
-	}, 500);
-}
-
-function moveTooltip(e) {
-	tooltipCoords = {
-		x: e.pageX - ($tooltip.outerWidth() / 2),
-		y: e.pageY - ($tooltip.outerHeight() + 15)
-	};
-
-	$tooltip.css({
-		'left': tooltipCoords.x,
-		'top': tooltipCoords.y
-	});
-}
-
-function hideTooltip(e) {
-	$tooltip.hide().css('opacity', 0);
-	clearTimeout(tooltipTimer);
-}
-
-function showBrowse(e) {
-	$browse.addClass('is-open');
-	$search.removeClass('is-open');
-	$searchField.val('');
-}
-
-function showSearch(e) {
-	$search.addClass('is-open');
-	$browse.removeClass('is-open');
-	setTimeout(function() {
-		$searchField.focus();
-	}, 200);
-}
-
-function showTopicDrop(e) {
-	e.preventDefault();
-
-	$browse.addClass('is-dropped');
-
-	if(!$topicDrop[0]) {
-		$topicDrop = $('.browse-topic-drop-menu-wrapper');
-	}
-
-	$topicDrop.show();
-	$browse.unbind('click', showTopicDrop);
-	$body.bind('keyup', setActiveDropItem);
-	$browse.bind('click', hideTopicDrop);
-	setTimeout(function() {
-		$body.bind('click', hideTopicDrop);
-	}, 0);
-}
-
-function hideTopicDrop(e) {
-	if(e.target == $('.browse-topic-drop-search-input')[0]) {
-		return;
-	}
-
-	$browse.removeClass('is-dropped');
-	$topicDrop.hide();
-	$body.unbind('click', hideTopicDrop);
-	$browse.bind('click', showTopicDrop);
-}
-
-function setTopic(e) {
-	if(e.target == $('.browse-topic-drop-search-input')[0]) {
-		return;
-	}
-
-	var $item = $(e.target).closest('a');
-	var boardName = $item.find('.board-name').html();
-
-	$item.parents('ul').not('.browse-topic-drop-menu').each(function(i) {
-		boardName = $(this).siblings('a').find('.board-name').html() + ' / ' + boardName;
-	});
-
-	if(!$currentBoard[0]) {
-		$currentBoard = $('.current-board');
-	}
-	$currentBoard.html(boardName);
-
-	var fontSize = 16;
-	$currentBoard.css('font-size', '16px');
-
-	while($currentBoard.width() > (sidebarWidth * .8) - 40) {
-		fontSize--;
-		if(fontSize < 11) {
-			break;
-		}
-		$currentBoard.css('font-size', fontSize + 'px');
-	}
-
-	showBrowse();
-}
-
-function newPost(e) {
-	$newPost.slideDown(300);
-	$('.new-post-title').focus();
-}
-
-function closeNewPost(e) {
-	$newPost.slideUp(300);	
-}
-
-function showFormTopicDrop(e) {
-	$formTopicDropBtn.addClass('is-dropped');
-	$formTopicDropMenu.show();
-	$formTopicDropBtn.unbind('click', showFormTopicDrop);
-	$formTopicDropBtn.bind('click', hideFormTopicDrop);
-
-	setTimeout(function() {
-		$body.bind('click', hideFormTopicDrop);
-	}, 0);
-	
-}
-
-function hideFormTopicDrop(e) {
-	if(e.target == $('.topic-drop-search-input')[0]) {
-		return;
-	}
-
-	$formTopicDropBtn.removeClass('is-dropped');
-	$formTopicDropMenu.hide();
-	$body.unbind('click', hideFormTopicDrop);
-	$formTopicDropBtn.unbind('click', hideFormTopicDrop);
-	$formTopicDropBtn.bind('click', showFormTopicDrop);
-}
-
-function setFormTopic(e) {
-	if(e.target == $('.topic-drop-search-input')[0]) {
-		return;
-	}
-	$formTopicDropBtn.removeClass('is-dropped');
-	hideFormTopicDrop(e);
-
-	var $item = $(e.target);
-	var boardName = $item.html();
-	$item.parents('ul').not('.form-topic-drop-menu').each(function(i) {
-		boardName = $(this).siblings('a').html() + ' / ' + boardName;
-	});
-	$formTopicDropBtn.html(boardName + ' <span class="drop-arrow">▾</span>');
-}
-
-function updateSidebar(e) {
-	// determine page scroll attributes
-	scrollTop = $(window).scrollTop();
-	discussionsBodyTop = $discussionBody.offset().top;
-	discussionsBodyBottom = discussionsBodyTop + $discussionBody.height();
-	var windowHeight = $(window).height();
-
-	// toggle fixed positioning
-	if(scrollTop > discussionsBodyTop - SIDEBAR_PADDING) {
-		$sidebar.addClass('fixed');
-		$sidebar.css('top', SIDEBAR_PADDING + 'px');
-	} else {
-		$sidebar.removeClass('fixed');
-		$sidebar.css('top', '0');
-	}
-
-	// set sidebar width
-	var sidebarWidth = .32 * $discussionBody.width() - 10;
-	$sidebar.css('width', sidebarWidth + 'px');
-
-	// show the entire sidebar at all times
-	var sidebarHeight = windowHeight - (scrollTop < discussionsBodyTop - SIDEBAR_PADDING ? discussionsBodyTop - scrollTop : SIDEBAR_PADDING) - SIDEBAR_PADDING - (scrollTop + windowHeight > discussionsBodyBottom + SIDEBAR_PADDING ? scrollTop + windowHeight - discussionsBodyBottom - SIDEBAR_PADDING : 0);
-	$sidebar.css('height', sidebarHeight > 400 ? sidebarHeight : 400 + 'px');
-
-	// update the list height
-	if(!$postListWrapper[0]) {
-		$postListWrapper = $('.post-list-wrapper');
-	}
-	$postListWrapper.css('height', (sidebarHeight - SIDEBAR_HEADER_HEIGHT - 4) + 'px');
-
-	// update title wrappers
-	var titleWidth = sidebarWidth - 115;	
-	$sidebarWidthStyles.html('.discussion-body .post-list a .title { width: ' + titleWidth + 'px !important; }');
-}
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index fc96640a35..8f04470506 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -21,8 +21,6 @@
 
 <%include file="_new_post.html" />
 
-<script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
-
 <section class="discussion container" id="discussion-container" data-roles="${roles}" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}" data-thread-pages="${thread_pages}">
     <div class="discussion-body">
         <div class="sidebar"></div>
diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html
index 9ec05b1534..c890c7350f 100644
--- a/lms/templates/discussion/single_thread.html
+++ b/lms/templates/discussion/single_thread.html
@@ -16,7 +16,6 @@
 <%block name="js_extra">
 <%include file="_js_body_dependencies.html" />
 <%static:js group='discussion'/>
-<script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
 
 </%block>