Cleanup

we can keep this method. @karishma plans to use it , we will have to reintroduce it soon if we remove now