Code cleanup
added toolbar destroy method