Moving listeners out of state classes