Removed a bit more junk.