DDF-366: Cleaned up content application and showed dependency on catalog.