Remove unused data structure