Removing deprecated operations and fix testcases