Cleanup, don't use test channel