[Minor] cleanup