Remove some more unneccessary gui bits