- Removed unused data structs.