Close and Close All
Revert "Close and Close All"

This reverts commit 22e9eda72a4d0ea9c78b165f703b95d6c2ec4d65.
Close And Close All