Cleanup some header items for non-registry users