cleanup after 0365d3e0818cef