Removed old fill_data function