More intelligent removal of previous gaiatest / marionette etc...