Cleaned up some unnecessary junk.