Removing global usage of Marionette