Cleanup for #321