Cleanup in Command.cs and moved DialogBoxBubble