Revert "Fixing references"

This reverts commit 8d35f7675c65e96084b5a1d72a6471de1897435f.