Removed Enyo code