Issue #1793372 Code cleanup