Cleanup
(cherry picked from commit ae14741)