Removed unused data functions