Partial cleanup of fill