eliminated some commented code