remove more tunnan from gui code