(#737) - Remove event listener for setup once triggered