Fix aliased variable
Remove unnecessary entropy encoder simulations