* init changes * cleanup keys and remove redunancdy * revert unintentional changes * KeyChannel -> ChannelKey