No longer setting emitter to inactive when removed