remove type from more structs, remove asserts