Removed registry sub header, cleanup