Remove unused structs to make it easier to understand