Refactoring - removing unused use sections