Less data fetching & old code deleted