CC-4854: Remove SaaS checking from codebase

-fixed