Migrate remove handler