*structs: cleanup