[Akash/Sailee] Refactoring , Removing static method from the codebase