Fix Remove action.
Update core templates.