#593 commenting out comments