fix a bug in remove/ remove the migration method for "if"/fix a test case

...e