Cleanup
(cherry picked from commit 719e4c1)