commented out some unused variables