More code
Remove headers