Added safe removal of emitters