Removed some more unused data