FALCON-869. Clean up required in the instance API calls. Contributed by Suhas Vasu