deleted some commented unused code