removed some unused structs.