arrow cleanup