sw2w remove after re-base