Removed Marionette implementation