Cleanup for #100