Fixed up dialog errors and got rid of unneeded fields.