Clean up imports (STORM-173)