Revert "Commented some out unused variables"

This reverts commit 209aca00311f444c1e8bac05c687ac624dbac3f5.