GUI: Removed some redundant code