Removed completely unused variables. Ifdef’ed out variable which is referenced from commented out code.
