Cleanup
(cherry picked from commit b4ad3dc)
(cherry picked from commit 747012e)