Removed old structs.