Refactored unused using