removed legacy structs