[358] Cleanup and avoiding unnecessary calls to API