Delete not needed headers, small refactoring