cleanup

removed separate dialog handling