Remove unused variable, simplify code.