Rename validation partial & clean out unused