Commit 7c037bd2be2e794dfd882b806f684ad74c56dbb8

Behdad Esfahbod 2019-05-07T13:37:43

[name] Clean up some more