(Issue 763) Code clean-up