Commented out some unused variables