Remove APM support