Cleanup for apollo integration.