Removed more junk code.