Headercleanup + cleanup