Remove remaining old listen code