Cleaned up some old references