Stripping out some unused targets to make way for context wiggles