Headers clean up