Advanced options dialog cleanup