Remove TODO. Everything seems to work fine without the reference.
More changes for compatibility with croogo 2.0