Remove usage of awestruct