Removing more Blue Box-specific references.