Dialog/controls cleanup