Added API data cleanup