Cleaning some code, removed toolbar from the window