fix for #2392 - cleanup events on invalid or duplicate models