Clean references.
Working version.
Cleanup.