cleaning up to pass r cmd check