If not directly required for Enyo, please remove those, too. We want to keep everything as consistent as possible between the examples.