commented out problematic section
commented out unused variables