removed about 400 commented out loc