2 unnecessary variables commented out