Staging: go7007: small cleanup