IX-9.6.0-partner-registration: Minor update + code cleanup