cleanup based on running strict mode
release prep
Merge branch 'release/1.1.13.6'
Merge tag '1.1.13.6' into develop

Cleanup to remove issues found when running in strict mode.