Remove a few leftovers from OPPO changes