Refactoring, remove unneded includes
Refactoring