DDF-366: Cleaned up feature declarations.