Remove legacy code, have all registry code just use our normalized names instead of trying to piece it together itself