Cleanup novice changes of PR #797