Cleaned up CanaryWorld initialisation a lot

Works better now, less useless dependencies