0.9.0 header API cleanup