Listener Cleanup, still not tested.

Signed-off-by: Mike Howe <mike@mcsnetworks.com>