minor Insight code cleanup

preparatory to other changes for UI testing work