remove unnecessary cstruct dependency