rename channels, clean up removal of clock