Split out no dependent listeners
Split out no dependent listeners