Cleanup for #91