Trim down references

There are some unused references, so we might as well kill them for now.