Remove useless assignments to simplify tests