Cleanup for #45