Cleaning up some bad references.