SLA work, and clean up APM