Eliminate unecessary logic and replace deprecated function calls
Merge pull request #1955 from Wikia/VideoSprint36-CleanupDeprecated

Eliminate unecessary logic and replace deprecated function calls