Remove some cruft
Fully implemented group dialog.