Cleanup
(cherry picked from commit f8afefe)