Removing animation AND swapping