Remove blocks that don't apply to registrant type