remove things that aren't needed in this branch