[MIE-670] - Cleanup based on pull request notes.