removing development mock data and api switch