Cleaned up some references that weren't needed.