Remove unused data structure...