Comments clean up
No custom header for now