RB: Clean-up admin console