more removals for streamlined deployment branch