cleanup
(cherry picked from commit 273df4e1)
(cherry picked from commit c96511a2)
(cherry picked from commit 1511ec84)
(cherry picked from commit d2554909)