deleted some commented out code