removing things and more changes