Refactor: Remove struct clutter
Refactor: Delete dead code
Refactor: Remove struct clutter