cwc: remove opaque structures