removing some commented code