Rebranding and cleanup