Refactoring

Removed:
- unused includes from headers
- unused functions