GUI cleanup; removed unused code

Makes #633 obsolete.