Fix #130 - Proper cleanup of on-demand loading triggers