Removed more junk