Removed some unnecessary junk.