minor changes in commenting out functions not used