Removing useless data structure