Cleanup of crunch base to use new non recursive API calls