API calls final cleanup