Removing unused references

* Removed all the "leftovers" that were creeping around