diff --git a/ChangeLog b/ChangeLog
index 8d435bad0..d8ca71007 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/Makefile.am:
+	* configure.in:
+	removed SingerBot-references
+
+	* plugins/live_tool/live_tool.cpp:
+	* src/core/tool.cpp:
+	cleanups
+
 	* src/gui/main_window.cpp:
 	* src/tracks/bb_track.cpp:
 	* src/tracks/pattern.cpp:
diff --git a/plugins/live_tool/live_tool.cpp b/plugins/live_tool/live_tool.cpp
index c534e0818..c217398ee 100644
--- a/plugins/live_tool/live_tool.cpp
+++ b/plugins/live_tool/live_tool.cpp
@@ -116,13 +116,8 @@ liveToolView::liveToolView( tool * _tool ) :
 		"F1-F10 keys mute the first 10 instruments in the "
 		"Beat+Baseline Editor." ) );
 
-	hide();
-	if( parentWidget() )
-	{
-		parentWidget()->hide();
-		parentWidget()->layout()->setSizeConstraint(
-							QLayout::SetFixedSize );
-	}
+	parentWidget()->hide();
+	parentWidget()->layout()->setSizeConstraint( QLayout::SetFixedSize );
 }
 
 
diff --git a/src/core/tool.cpp b/src/core/tool.cpp
index 7c195a914..821aa79e7 100644
--- a/src/core/tool.cpp
+++ b/src/core/tool.cpp
@@ -72,22 +72,13 @@ tool * tool::instantiate( const QString & _plugin_name, model * _parent )
 
 
 toolView::toolView( tool * _tool ) :
-	pluginView( _tool, engine::getMainWindow()->workspace() )
+	pluginView( _tool, NULL )
 {
-	QWidget * window;
-	if( engine::getMainWindow()->workspace() )
-	{
-		engine::getMainWindow()->workspace()->addSubWindow( this );
-		window = parentWidget();
-		window->setAttribute( Qt::WA_DeleteOnClose, FALSE );
-	}
-	else
-	{
-		window = this;
-	}
+	engine::getMainWindow()->workspace()->addSubWindow( this );
+	parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
 
-	window->setWindowTitle( _tool->publicName() );
-	window->setWindowIcon( _tool->getDescriptor()->logo->pixmap() );
+	setWindowTitle( _tool->publicName() );
+	setWindowIcon( _tool->getDescriptor()->logo->pixmap() );
 }