remove unneeded structs