[Delivers #84025178] Cleaned up code for delivery.