deleted some commented code