Clean up on the extension API side