Cleanup for #98