FINALLY remove channel enums