Refactoring - remove unused use sections