further gui cleanup