Revert "removed a lot superfluous references"

This reverts commit d999f2b0afd183e9c2225a5d0a445b68bf47cfe0.