diff --git a/buffet/any_internal_impl.h b/buffet/any_internal_impl.h
index cbf0bb8..5d93200 100644
--- a/buffet/any_internal_impl.h
+++ b/buffet/any_internal_impl.h
@@ -60,12 +60,12 @@
 struct TypedData : public Data {
   explicit TypedData(const T& value) : value_(value) {}
 
-  virtual const std::type_info& GetType() const override { return typeid(T); }
-  virtual void CopyTo(Buffer* buffer) const override;
-  virtual bool IsConvertibleToInteger() const override {
+  const std::type_info& GetType() const override { return typeid(T); }
+  void CopyTo(Buffer* buffer) const override;
+  bool IsConvertibleToInteger() const override {
     return std::is_integral<T>::value || std::is_enum<T>::value;
   }
-  virtual intmax_t GetAsInteger() const override {
+  intmax_t GetAsInteger() const override {
     intmax_t int_val = 0;
     bool converted = TryConvert(value_, &int_val);
     CHECK(converted) << "Unable to convert value of type " << typeid(T).name()
diff --git a/buffet/commands/command_instance_unittest.cc b/buffet/commands/command_instance_unittest.cc
index cb639b5..3f81016 100644
--- a/buffet/commands/command_instance_unittest.cc
+++ b/buffet/commands/command_instance_unittest.cc
@@ -16,7 +16,7 @@
 
 class CommandInstanceTest : public ::testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     auto json = CreateDictionaryValue(R"({
       'base': {
         'reboot': {
diff --git a/buffet/commands/command_queue_unittest.cc b/buffet/commands/command_queue_unittest.cc
index 117d7bc..2c0e01b 100644
--- a/buffet/commands/command_queue_unittest.cc
+++ b/buffet/commands/command_queue_unittest.cc
@@ -25,7 +25,7 @@
 // Aborts if duplicate commands are added or non-existent commands are removed.
 class FakeDispatchInterface : public buffet::CommandDispachInterface {
  public:
-  virtual void OnCommandAdded(
+  void OnCommandAdded(
       const std::string& command_id,
       const buffet::CommandInstance* command_instance) override {
     CHECK(ids_.insert(command_id).second)
@@ -34,7 +34,7 @@
         << "Command instance already exists";
   }
 
-  virtual void OnCommandRemoved(
+  void OnCommandRemoved(
       const std::string& command_id,
       const buffet::CommandInstance* command_instance) override {
     CHECK_EQ(1, ids_.erase(command_id))
diff --git a/buffet/commands/prop_constraints.h b/buffet/commands/prop_constraints.h
index da43e86..cd35d65 100644
--- a/buffet/commands/prop_constraints.h
+++ b/buffet/commands/prop_constraints.h
@@ -96,12 +96,12 @@
       : limit_(limit) {}
 
   // Implementation of Constraint::HasOverriddenAttributes().
-  virtual bool HasOverriddenAttributes() const override {
+  bool HasOverriddenAttributes() const override {
     return !limit_.is_inherited;
   }
 
   // Implementation of Constraint::ToJson().
-  virtual std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override {
+  std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override {
     return TypedValueToJson(limit_.value, error);
   }
 
@@ -124,11 +124,10 @@
       : ConstraintMinMaxBase<T>(limit) {}
 
   // Implementation of Constraint::GetType().
-  virtual ConstraintType GetType() const { return ConstraintType::Min; }
+  ConstraintType GetType() const { return ConstraintType::Min; }
 
   // Implementation of Constraint::Validate().
-  virtual bool Validate(const PropValue& value,
-                        ErrorPtr* error) const override {
+  bool Validate(const PropValue& value, ErrorPtr* error) const override {
     T v = value.GetValueAsAny().Get<T>();
     if (v < this->limit_.value)
       return this->ReportErrorLessThan(
@@ -138,12 +137,12 @@
   }
 
   // Implementation of Constraint::CloneAsInherited().
-  virtual std::shared_ptr<Constraint> CloneAsInherited() const override {
+  std::shared_ptr<Constraint> CloneAsInherited() const override {
     return std::make_shared<ConstraintMin>(this->limit_.value);
   }
 
   // Implementation of Constraint::GetDictKey().
-  virtual const char* GetDictKey() const override {
+  const char* GetDictKey() const override {
     return commands::attributes::kNumeric_Min;
   }
 
@@ -161,11 +160,10 @@
       : ConstraintMinMaxBase<T>(limit) {}
 
   // Implementation of Constraint::GetType().
-  virtual ConstraintType GetType() const { return ConstraintType::Max; }
+  ConstraintType GetType() const { return ConstraintType::Max; }
 
   // Implementation of Constraint::Validate().
-  virtual bool Validate(const PropValue& value,
-                        ErrorPtr* error) const override {
+  bool Validate(const PropValue& value, ErrorPtr* error) const override {
     T v = value.GetValueAsAny().Get<T>();
     if (v > this->limit_.value)
       return this->ReportErrorGreaterThan(
@@ -175,12 +173,12 @@
   }
 
   // Implementation of Constraint::CloneAsInherited().
-  virtual std::shared_ptr<Constraint> CloneAsInherited() const override {
+  std::shared_ptr<Constraint> CloneAsInherited() const override {
     return std::make_shared<ConstraintMax>(this->limit_.value);
   }
 
   // Implementation of Constraint::GetDictKey().
-  virtual const char* GetDictKey() const override {
+  const char* GetDictKey() const override {
     return commands::attributes::kNumeric_Max;
   }
 
@@ -196,9 +194,9 @@
   explicit ConstraintStringLength(int limit);
 
   // Implementation of Constraint::HasOverriddenAttributes().
-  virtual bool HasOverriddenAttributes() const override;
+  bool HasOverriddenAttributes() const override;
   // Implementation of Constraint::ToJson().
-  virtual std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override;
+  std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override;
 
   // Stores the upper/lower value limit for string length constraint.
   // |limit_.is_inherited| indicates whether the constraint is inherited
@@ -215,15 +213,15 @@
   explicit ConstraintStringLengthMin(const InheritableAttribute<int>& limit);
   explicit ConstraintStringLengthMin(int limit);
   // Implementation of Constraint::GetType().
-  virtual ConstraintType GetType() const override {
+  ConstraintType GetType() const override {
     return ConstraintType::StringLengthMin;
   }
   // Implementation of Constraint::Validate().
-  virtual bool Validate(const PropValue& value, ErrorPtr* error) const override;
+  bool Validate(const PropValue& value, ErrorPtr* error) const override;
   // Implementation of Constraint::CloneAsInherited().
-  virtual std::shared_ptr<Constraint> CloneAsInherited() const override;
+  std::shared_ptr<Constraint> CloneAsInherited() const override;
   // Implementation of Constraint::GetDictKey().
-  virtual const char* GetDictKey() const override {
+  const char* GetDictKey() const override {
     return commands::attributes::kString_MinLength;
   }
  private:
@@ -236,15 +234,15 @@
   explicit ConstraintStringLengthMax(const InheritableAttribute<int>& limit);
   explicit ConstraintStringLengthMax(int limit);
   // Implementation of Constraint::GetType().
-  virtual ConstraintType GetType() const override {
+  ConstraintType GetType() const override {
     return ConstraintType::StringLengthMax;
   }
   // Implementation of Constraint::Validate().
-  virtual bool Validate(const PropValue& value, ErrorPtr* error) const override;
+  bool Validate(const PropValue& value, ErrorPtr* error) const override;
   // Implementation of Constraint::CloneAsInherited().
-  virtual std::shared_ptr<Constraint> CloneAsInherited() const override;
+  std::shared_ptr<Constraint> CloneAsInherited() const override;
   // Implementation of Constraint::GetDictKey().
-  virtual const char* GetDictKey() const override {
+  const char* GetDictKey() const override {
     return commands::attributes::kString_MaxLength;
   }
 
@@ -262,18 +260,17 @@
       : set_(set) {}
 
   // Implementation of Constraint::GetType().
-  virtual ConstraintType GetType() const override {
+  ConstraintType GetType() const override {
     return ConstraintType::OneOf;
   }
 
   // Implementation of Constraint::HasOverriddenAttributes().
-  virtual bool HasOverriddenAttributes() const override {
+  bool HasOverriddenAttributes() const override {
     return !set_.is_inherited;
   }
 
   // Implementation of Constraint::Validate().
-  virtual bool Validate(const PropValue& value,
-                        ErrorPtr* error) const override {
+  bool Validate(const PropValue& value, ErrorPtr* error) const override {
     using string_utils::ToString;
     T v = value.GetValueAsAny().Get<T>();
     for (const auto& item : set_.value) {
@@ -289,17 +286,17 @@
   }
 
   // Implementation of Constraint::CloneAsInherited().
-  virtual std::shared_ptr<Constraint> CloneAsInherited() const override {
+  std::shared_ptr<Constraint> CloneAsInherited() const override {
     return std::make_shared<ConstraintOneOf>(set_.value);
   }
 
   // Implementation of Constraint::ToJson().
-  virtual std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override {
+  std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override {
     return TypedValueToJson(set_.value, error);
   }
 
   // Implementation of Constraint::GetDictKey().
-  virtual const char* GetDictKey() const override {
+  const char* GetDictKey() const override {
     return commands::attributes::kOneOf_Enum;
   }
 
diff --git a/buffet/commands/prop_types.h b/buffet/commands/prop_types.h
index 016d2d5..f7cd5a1 100644
--- a/buffet/commands/prop_types.h
+++ b/buffet/commands/prop_types.h
@@ -174,21 +174,21 @@
 template<class Derived, class Value, typename T>
 class PropTypeBase : public PropType {
  public:
-  virtual ValueType GetType() const override { return GetValueType<T>(); }
-  virtual std::shared_ptr<PropType> Clone() const override {
+  ValueType GetType() const override { return GetValueType<T>(); }
+  std::shared_ptr<PropType> Clone() const override {
     return std::make_shared<Derived>(*static_cast<const Derived*>(this));
   }
-  virtual std::shared_ptr<PropValue> CreateValue() const override {
+  std::shared_ptr<PropValue> CreateValue() const override {
     return std::make_shared<Value>(this);
   }
-  virtual std::shared_ptr<PropValue> CreateValue(const Any& v) const override {
+  std::shared_ptr<PropValue> CreateValue(const Any& v) const override {
     auto value = std::make_shared<Value>(this);
     value->SetValue(v.Get<T>());
     return std::move(value);
   }
-  virtual bool ConstraintsFromJson(const base::DictionaryValue* value,
-                                   std::set<std::string>* processed_keys,
-                                   ErrorPtr* error) override;
+  bool ConstraintsFromJson(const base::DictionaryValue* value,
+                           std::set<std::string>* processed_keys,
+                           ErrorPtr* error) override;
 
   // Helper method to obtain a vector of OneOf constraint values.
   std::vector<T> GetOneOfValues() const {
@@ -203,9 +203,9 @@
 class NumericPropTypeBase : public PropTypeBase<Derived, Value, T> {
  public:
   using _Base = PropTypeBase<Derived, Value, T>;
-  virtual bool ConstraintsFromJson(const base::DictionaryValue* value,
-                                   std::set<std::string>* processed_keys,
-                                   ErrorPtr* error) override;
+  bool ConstraintsFromJson(const base::DictionaryValue* value,
+                           std::set<std::string>* processed_keys,
+                           ErrorPtr* error) override;
 
   // Helper method to set and obtain a min/max constraint values.
   // Used mostly for unit testing.
@@ -231,8 +231,8 @@
 class IntPropType : public NumericPropTypeBase<IntPropType, IntValue, int> {
  public:
   // Overrides from the PropType base class.
-  virtual IntPropType* GetInt() override { return this; }
-  virtual IntPropType const* GetInt() const override { return this; }
+  IntPropType* GetInt() override { return this; }
+  IntPropType const* GetInt() const override { return this; }
 };
 
 // Property definition of Number type.
@@ -240,8 +240,8 @@
     : public NumericPropTypeBase<DoublePropType, DoubleValue, double> {
  public:
   // Overrides from the PropType base class.
-  virtual DoublePropType* GetDouble() override { return this; }
-  virtual DoublePropType const* GetDouble() const override { return this; }
+  DoublePropType* GetDouble() override { return this; }
+  DoublePropType const* GetDouble() const override { return this; }
 };
 
 // Property definition of String type.
@@ -250,12 +250,12 @@
  public:
   using _Base = PropTypeBase<StringPropType, StringValue, std::string>;
   // Overrides from the PropType base class.
-  virtual StringPropType* GetString() override { return this; }
-  virtual StringPropType const* GetString() const override { return this; }
+  StringPropType* GetString() override { return this; }
+  StringPropType const* GetString() const override { return this; }
 
-  virtual bool ConstraintsFromJson(const base::DictionaryValue* value,
-                                   std::set<std::string>* processed_keys,
-                                   ErrorPtr* error) override;
+  bool ConstraintsFromJson(const base::DictionaryValue* value,
+                           std::set<std::string>* processed_keys,
+                           ErrorPtr* error) override;
 
   // Helper methods to add and inspect simple constraints.
   // Used mostly for unit testing.
@@ -269,8 +269,8 @@
     : public PropTypeBase<BooleanPropType, BooleanValue, bool> {
  public:
   // Overrides from the PropType base class.
-  virtual BooleanPropType* GetBoolean() override { return this; }
-  virtual BooleanPropType const* GetBoolean() const override { return this; }
+  BooleanPropType* GetBoolean() override { return this; }
+  BooleanPropType const* GetBoolean() const override { return this; }
 };
 
 // Parameter definition of Object type.
@@ -281,19 +281,19 @@
   ObjectPropType();
 
   // Overrides from the ParamType base class.
-  virtual bool HasOverriddenAttributes() const override;
+  bool HasOverriddenAttributes() const override;
 
-  virtual ObjectPropType* GetObject() override { return this; }
-  virtual ObjectPropType const* GetObject() const override { return this; }
+  ObjectPropType* GetObject() override { return this; }
+  ObjectPropType const* GetObject() const override { return this; }
 
-  virtual std::unique_ptr<base::Value> ToJson(bool full_schema,
-                                              ErrorPtr* error) const override;
-  virtual bool ObjectSchemaFromJson(const base::DictionaryValue* value,
-                                    const PropType* base_schema,
-                                    std::set<std::string>* processed_keys,
-                                    ErrorPtr* error) override;
+  std::unique_ptr<base::Value> ToJson(bool full_schema,
+                                      ErrorPtr* error) const override;
+  bool ObjectSchemaFromJson(const base::DictionaryValue* value,
+                            const PropType* base_schema,
+                            std::set<std::string>* processed_keys,
+                            ErrorPtr* error) override;
 
-  virtual std::shared_ptr<const ObjectSchema> GetObjectSchema() const override {
+  std::shared_ptr<const ObjectSchema> GetObjectSchema() const override {
     return object_schema_.value;
   }
   void SetObjectSchema(const std::shared_ptr<const ObjectSchema>& schema) {
diff --git a/buffet/commands/prop_values.h b/buffet/commands/prop_values.h
index adaa91d..b408f0d 100644
--- a/buffet/commands/prop_values.h
+++ b/buffet/commands/prop_values.h
@@ -124,22 +124,22 @@
   using PropValue::PropValue;
 
   // Overrides from PropValue base class.
-  virtual ValueType GetType() const override { return GetValueType<T>(); }
-  virtual std::shared_ptr<PropValue> Clone() const override {
+  ValueType GetType() const override { return GetValueType<T>(); }
+  std::shared_ptr<PropValue> Clone() const override {
     return std::make_shared<Derived>(*static_cast<const Derived*>(this));
   }
 
-  virtual std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override {
+  std::unique_ptr<base::Value> ToJson(ErrorPtr* error) const override {
     return TypedValueToJson(value_, error);
   }
 
-  virtual bool FromJson(const base::Value* value,
+  bool FromJson(const base::Value* value,
                         ErrorPtr* error) override {
     return TypedValueFromJson(value, GetPropType()->GetObjectSchemaPtr(),
                               &value_, error);
   }
 
-  virtual bool IsEqual(const PropValue* value) const override {
+  bool IsEqual(const PropValue* value) const override {
     if (GetType() != value->GetType())
       return false;
     const _Base* value_base = static_cast<const _Base*>(value);
@@ -147,7 +147,7 @@
   }
 
   // Helper methods to get and set the C++ representation of the value.
-  virtual Any GetValueAsAny() const override { return value_; }
+  Any GetValueAsAny() const override { return value_; }
   const T& GetValue() const { return value_; }
   void SetValue(T value) { value_ = std::move(value); }
 
@@ -159,32 +159,32 @@
 class IntValue final : public TypedValueBase<IntValue, int> {
  public:
   using _Base::_Base;  // Expose the custom constructor of the base class.
-  virtual IntValue* GetInt() override { return this; }
-  virtual IntValue const* GetInt() const override { return this; }
+  IntValue* GetInt() override { return this; }
+  IntValue const* GetInt() const override { return this; }
 };
 
 // Value of type Number.
 class DoubleValue final : public TypedValueBase<DoubleValue, double> {
  public:
   using _Base::_Base;  // Expose the custom constructor of the base class.
-  virtual DoubleValue* GetDouble() override { return this; }
-  virtual DoubleValue const* GetDouble() const override { return this; }
+  DoubleValue* GetDouble() override { return this; }
+  DoubleValue const* GetDouble() const override { return this; }
 };
 
 // Value of type String.
 class StringValue final : public TypedValueBase<StringValue, std::string> {
  public:
   using _Base::_Base;  // Expose the custom constructor of the base class.
-  virtual StringValue* GetString() override { return this; }
-  virtual StringValue const* GetString() const override { return this; }
+  StringValue* GetString() override { return this; }
+  StringValue const* GetString() const override { return this; }
 };
 
 // Value of type Boolean.
 class BooleanValue final : public TypedValueBase<BooleanValue, bool> {
  public:
   using _Base::_Base;  // Expose the custom constructor of the base class.
-  virtual BooleanValue* GetBoolean() override { return this; }
-  virtual BooleanValue const* GetBoolean() const override { return this; }
+  BooleanValue* GetBoolean() override { return this; }
+  BooleanValue const* GetBoolean() const override { return this; }
 };
 
 // Value of type Object.
@@ -192,8 +192,8 @@
                                                 native_types::Object> {
  public:
   using _Base::_Base;  // Expose the custom constructor of the base class.
-  virtual ObjectValue* GetObject() override { return this; }
-  virtual ObjectValue const* GetObject() const override { return this; }
+  ObjectValue* GetObject() override { return this; }
+  ObjectValue const* GetObject() const override { return this; }
 };
 }  // namespace buffet
 
diff --git a/buffet/device_registration_info.h b/buffet/device_registration_info.h
index a150253..49408da 100644
--- a/buffet/device_registration_info.h
+++ b/buffet/device_registration_info.h
@@ -19,7 +19,7 @@
 #include "buffet/storage_interface.h"
 
 namespace base {
-  class Value;
+class Value;
 }  // namespace base
 
 namespace buffet {
diff --git a/buffet/device_registration_info_unittest.cc b/buffet/device_registration_info_unittest.cc
index 5f5d8ca..553a118 100644
--- a/buffet/device_registration_info_unittest.cc
+++ b/buffet/device_registration_info_unittest.cc
@@ -157,7 +157,7 @@
 
 class DeviceRegistrationInfoTest : public ::testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     InitDefaultStorage(&data_);
     storage_ = std::make_shared<MemStorage>();
     storage_->Save(&data_);
diff --git a/buffet/http_connection_curl.h b/buffet/http_connection_curl.h
index 9a82e26..0460bcf 100644
--- a/buffet/http_connection_curl.h
+++ b/buffet/http_connection_curl.h
@@ -27,19 +27,18 @@
 
   // Overrides from http::Connection.
   // See http_connection.h for description of these methods.
-  virtual bool SendHeaders(const HeaderList& headers, ErrorPtr* error) override;
-  virtual bool WriteRequestData(const void* data, size_t size,
-                                ErrorPtr* error) override;
-  virtual bool FinishRequest(ErrorPtr* error) override;
+  bool SendHeaders(const HeaderList& headers, ErrorPtr* error) override;
+  bool WriteRequestData(const void* data, size_t size,
+                        ErrorPtr* error) override;
+  bool FinishRequest(ErrorPtr* error) override;
 
-  virtual int GetResponseStatusCode() const override;
-  virtual std::string GetResponseStatusText() const override;
-  virtual std::string GetProtocolVersion() const override;
-  virtual std::string GetResponseHeader(
-     const std::string& header_name) const override;
-  virtual uint64_t GetResponseDataSize() const override;
-  virtual bool ReadResponseData(void* data, size_t buffer_size,
-                                size_t* size_read, ErrorPtr* error) override;
+  int GetResponseStatusCode() const override;
+  std::string GetResponseStatusText() const override;
+  std::string GetProtocolVersion() const override;
+  std::string GetResponseHeader(const std::string& header_name) const override;
+  uint64_t GetResponseDataSize() const override;
+  bool ReadResponseData(void* data, size_t buffer_size,
+                        size_t* size_read, ErrorPtr* error) override;
 
  protected:
   // Write data callback. Used by CURL when receiving response data.
diff --git a/buffet/http_connection_fake.h b/buffet/http_connection_fake.h
index 57bf016..788d551 100644
--- a/buffet/http_connection_fake.h
+++ b/buffet/http_connection_fake.h
@@ -27,19 +27,18 @@
 
   // Overrides from http::Connection.
   // See http_connection.h for description of these methods.
-  virtual bool SendHeaders(const HeaderList& headers, ErrorPtr* error) override;
-  virtual bool WriteRequestData(const void* data, size_t size,
-                                ErrorPtr* error) override;
-  virtual bool FinishRequest(ErrorPtr* error) override;
+  bool SendHeaders(const HeaderList& headers, ErrorPtr* error) override;
+  bool WriteRequestData(const void* data, size_t size,
+                        ErrorPtr* error) override;
+  bool FinishRequest(ErrorPtr* error) override;
 
-  virtual int GetResponseStatusCode() const override;
-  virtual std::string GetResponseStatusText() const override;
-  virtual std::string GetProtocolVersion() const override;
-  virtual std::string GetResponseHeader(
-     const std::string& header_name) const override;
-  virtual uint64_t GetResponseDataSize() const override;
-  virtual bool ReadResponseData(void* data, size_t buffer_size,
-                                size_t* size_read, ErrorPtr* error) override;
+  int GetResponseStatusCode() const override;
+  std::string GetResponseStatusText() const override;
+  std::string GetProtocolVersion() const override;
+  std::string GetResponseHeader(const std::string& header_name) const override;
+  uint64_t GetResponseDataSize() const override;
+  bool ReadResponseData(void* data, size_t buffer_size,
+                        size_t* size_read, ErrorPtr* error) override;
 
  private:
   // Request and response objects passed to the user-provided request handler
diff --git a/buffet/http_transport_curl.h b/buffet/http_transport_curl.h
index ddb24ce..740adf7 100644
--- a/buffet/http_transport_curl.h
+++ b/buffet/http_transport_curl.h
@@ -27,7 +27,7 @@
   Transport();
   virtual ~Transport();
 
-  virtual std::unique_ptr<http::Connection> CreateConnection(
+  std::unique_ptr<http::Connection> CreateConnection(
       std::shared_ptr<http::Transport> transport,
       const std::string& url,
       const std::string& method,
diff --git a/buffet/http_transport_fake.h b/buffet/http_transport_fake.h
index 7905f3e..71acd3e 100644
--- a/buffet/http_transport_fake.h
+++ b/buffet/http_transport_fake.h
@@ -65,7 +65,7 @@
   void ResetRequestCount() { request_count_ = 0; }
 
   // Overload from http::Transport
-  virtual std::unique_ptr<http::Connection> CreateConnection(
+  std::unique_ptr<http::Connection> CreateConnection(
       std::shared_ptr<http::Transport> transport,
       const std::string& url,
       const std::string& method,
diff --git a/buffet/http_utils.h b/buffet/http_utils.h
index 0333c82..87b9b3a 100644
--- a/buffet/http_utils.h
+++ b/buffet/http_utils.h
@@ -13,8 +13,8 @@
 #include <vector>
 
 namespace base {
-  class Value;
-  class DictionaryValue;
+class Value;
+class DictionaryValue;
 }  // namespace base
 
 namespace buffet {
diff --git a/buffet/storage_impls.h b/buffet/storage_impls.h
index 6e69084..156f946 100644
--- a/buffet/storage_impls.h
+++ b/buffet/storage_impls.h
@@ -18,8 +18,8 @@
  public:
   explicit FileStorage(const base::FilePath& file_path);
   virtual ~FileStorage() = default;
-  virtual std::unique_ptr<base::Value> Load() override;
-  virtual bool Save(const base::Value* config) override;
+  std::unique_ptr<base::Value> Load() override;
+  bool Save(const base::Value* config) override;
 
  private:
   base::FilePath file_path_;
@@ -31,8 +31,8 @@
  public:
   MemStorage() = default;
   virtual ~MemStorage() = default;
-  virtual std::unique_ptr<base::Value> Load() override;
-  virtual bool Save(const base::Value* config) override;
+  std::unique_ptr<base::Value> Load() override;
+  bool Save(const base::Value* config) override;
   int save_count() { return save_count_; }
   void reset_save_count() { save_count_ = 0; }