[CB-3529] moved excess cleaning to create script