Revert "Cleaned some unused references"

This reverts commit a8181fb005ed88db612992736008439419818e52.