Cleanup for #1393