removing incorrect struct defintions