Uncomment some unused variables