more post-rebranding cleanup