Cleanup for #2150