Fix: @SuppressLint("NewApi") missing on methods clear and remove