Final cleanups on subscription screen