- Clean up
- Remove unneeded declaration
- Removed unused headers