Comment out unused variables
Adjust configuration