- removed unused struct
- added missing check