Removing some unused variables and commenting out a printf

Some small clean up.