Minor adjustments on headers
Delete is in place