removed some commented variables