These references are no longer necessary, and cleaning them up makes it easier to clean up other parts of the code base.