More global App ENV cleanup.