Removed gui and cli classes