- Removed redundant enum type
- Added in extra redundancy check for GDO first time use