Removing more junk not related to the example