Remove now duplicated encoding check logic from kernel/