Revert "World Class"

This reverts commit f75d09ec7d2703137476c73a25319f1f96c7c70c.