Cleanup of Enyo2 branch