[refactoring] Drop commented out code