comment cleanup, tested one more exception