STORM-444 removing unused imports and unintended changes.