More cleanup, removed taskbar