Cleanup for #355