Remove the dumb header stuff