Cleaned up some referneces