Removed other useless structs