Revert "[3.0] Added test cases and removed dead code"