NOT A USABLE COMMIT ; More cleanups and expose channel in config