Cleanup and relax triggers API