StatusHeader API cleaned up