Cleanup for #8