Did this TODO get done?  Are users demoted to the Registered account level if their org is removed?