Remove more data structures