Removed unused lines from GUI and Machine