Get rid of things not needed in this branch