diff --git a/src/Makefile.am b/src/Makefile.am
index f1470e7d3..aab92081a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,7 +104,7 @@ audacity_SOURCES = \
 	AudacityLogger.h \
 	AudioIO.cpp \
 	AudioIO.h \
-	AudioIOListenerer.h \
+	AudioIOListener.h \
 	AutoRecovery.cpp \
 	AutoRecovery.h \
 	BatchCommandDialog.cpp \
@@ -231,6 +231,7 @@ audacity_SOURCES = \
 	TrackPanel.h \
 	TrackPanelAx.cpp \
 	TrackPanelAx.h \
+	TrackPanelListener.h \
 	TranslatableStringArray.h \
 	UndoManager.cpp \
 	UndoManager.h \
diff --git a/src/Project.cpp b/src/Project.cpp
index 60f0f909a..2c028623a 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -4175,16 +4175,6 @@ ControlToolBar *AudacityProject::GetControlToolBar()
            NULL);
 }
 
-//JKC: same as above *except* this a virtual function that
-//can be called from the track panel callback.
-//It seems a little crazy doing this but TrackArtist
-//needs to get information about the tool bar state and
-//I don't currently see a cleaner way.
-ControlToolBar * AudacityProject::TP_GetControlToolBar()
-{
-   return GetControlToolBar();
-}
-
 ToolsToolBar * AudacityProject::TP_GetToolsToolBar()
 {
    return GetToolsToolBar();
@@ -4602,22 +4592,6 @@ void AudacityProject::RefreshTPTrack(Track* pTrk, bool refreshbacking /*= true*/
 }
 
 
-// TrackPanel callback methods
-
-int AudacityProject::TP_GetCurrentTool()
-{
-   //ControlToolBar might be NULL--especially on shutdown.
-   //Make sure it isn't and if it is, return a reasonable value
-   ToolsToolBar *ctb = GetToolsToolBar();
-   if (ctb)
-      return GetToolsToolBar()->GetCurrentTool();
-   else
-      return 0;
-}
-
-
-
-
 // TrackPanel callback method
 void AudacityProject::TP_PushState(wxString desc, wxString shortDesc,
                                    int flags)
@@ -4649,11 +4623,6 @@ void AudacityProject::TP_RedrawScrollbars()
    FixScrollbars();
 }
 
-void AudacityProject::TP_HandleResize()
-{
-   HandleResize();
-}
-
 void AudacityProject::GetPlayRegion(double* playRegionStart,
                                     double *playRegionEnd)
 {
@@ -4949,7 +4918,7 @@ void AudacityProject::RemoveTrack(Track * toRemove)
       _("Track Remove"));
 
    TP_RedrawScrollbars();
-   TP_HandleResize();
+   HandleResize();
    GetTrackPanel()->Refresh(false);
 }
 
diff --git a/src/Project.h b/src/Project.h
index 93c5fcad9..07eae659a 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -395,9 +395,7 @@ class AUDACITY_DLL_API AudacityProject:  public wxFrame,
    virtual void TP_DisplaySelection();
    virtual void TP_DisplayStatusMessage(wxString msg);
 
-   virtual int TP_GetCurrentTool();
    virtual ToolsToolBar * TP_GetToolsToolBar();
-   virtual ControlToolBar * TP_GetControlToolBar();
 
    virtual void TP_PushState(wxString longDesc, wxString shortDesc,
                              int flags);
@@ -408,7 +406,6 @@ class AUDACITY_DLL_API AudacityProject:  public wxFrame,
    virtual void TP_ScrollRight();
    virtual void TP_ScrollWindow(double scrollto);
    virtual void TP_ScrollUpDown(int delta);
-   virtual void TP_HandleResize();
 
    // ToolBar
 
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 9a4f0aa1a..0c5caaf3f 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -1536,11 +1536,6 @@ void TrackPanel::MakeParentRedrawScrollbars()
    mListener->TP_RedrawScrollbars();
 }
 
-void TrackPanel::MakeParentResize()
-{
-   mListener->TP_HandleResize();
-}
-
 void TrackPanel::HandleEscapeKey(bool down)
 {
    if (!down)
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index bc4e8be32..dfe3deb83 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -459,7 +459,6 @@ protected:
                             int flags = PUSH_AUTOSAVE);
    virtual void MakeParentModifyState(bool bWantsAutoSave);    // if true, writes auto-save file. Should set only if you really want the state change restored after
                                                                // a crash, as it can take many seconds for large (eg. 10 track-hours) projects
-   virtual void MakeParentResize();
 
    virtual void OnSetName(wxCommandEvent &event);
 
diff --git a/src/TrackPanelListener.h b/src/TrackPanelListener.h
index 8d321276b..4d5b2babe 100644
--- a/src/TrackPanelListener.h
+++ b/src/TrackPanelListener.h
@@ -23,9 +23,7 @@ class AUDACITY_DLL_API TrackPanelListener {
    virtual void TP_DisplaySelection() = 0;
    virtual void TP_DisplayStatusMessage(wxString msg) = 0;
 
-   virtual int TP_GetCurrentTool() = 0;
    virtual ToolsToolBar * TP_GetToolsToolBar() = 0;
-   virtual ControlToolBar * TP_GetControlToolBar() = 0;
 
    virtual void TP_PushState(wxString shortDesc, wxString longDesc,
                             int flags = PUSH_AUTOSAVE) = 0;
@@ -36,7 +34,6 @@ class AUDACITY_DLL_API TrackPanelListener {
    virtual void TP_ScrollRight() = 0;
    virtual void TP_ScrollWindow(double scrollto) = 0;
    virtual void TP_ScrollUpDown(int delta) = 0;
-   virtual void TP_HandleResize() = 0;
 };
 
 #endif
diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj
index 0a0d65330..e400fbc34 100755
--- a/win/Projects/Audacity/Audacity.vcxproj
+++ b/win/Projects/Audacity/Audacity.vcxproj
@@ -434,6 +434,7 @@
     <ClInclude Include="..\..\..\src\SseMathFuncs.h" />
     <ClInclude Include="..\..\..\src\toolbars\SpectralSelectionBar.h" />
     <ClInclude Include="..\..\..\src\toolbars\SpectralSelectionBarListener.h" />
+    <ClInclude Include="..\..\..\src\TrackPanelListener.h" />
     <ClInclude Include="..\..\..\src\TranslatableStringArray.h" />
     <ClInclude Include="..\..\..\src\WaveTrackLocation.h" />
     <ClInclude Include="..\..\..\src\widgets\HelpSystem.h" />
diff --git a/win/Projects/Audacity/Audacity.vcxproj.filters b/win/Projects/Audacity/Audacity.vcxproj.filters
index 6dcc3b1a8..dc121908a 100755
--- a/win/Projects/Audacity/Audacity.vcxproj.filters
+++ b/win/Projects/Audacity/Audacity.vcxproj.filters
@@ -1711,6 +1711,9 @@
     <ClInclude Include="..\..\..\src\TranslatableStringArray.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\TrackPanelListener.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\audacity.ico">