Cleanup
(cherry picked from commit b4ad3dc)