Cleanup
(cherry picked from commit 3c7715f)