Organizing imports and removing unused imported modules