... of these structs so remove them again, sorry for the noise.

Change-Id: Ic1b5fc0fd3d778cf8ab915774a12efecd5c5b451