codereview 5744706000519168, patch set 5

More clean up