removed commented unused code