Removed GUI specific stuff