Removing obsolete functions
Fixing broken reference to removed function
Removing unused function from component tests
Removing obsolete functions
Fixing false positive for family Media Type