Cleanup for #9