minor update (removing nops)