Removed some unused code from GUI