cleanup commented code from prev. commit