much cleaning of commented out or unused code