Remove less dependencies. Fixed header for good