Make automatic cleanup configurable (not documented)