Merge pull request #2288 from lioncash/unnecessary ISOProperties: Remove unnecessary/unused variables & controls.
