Cleanup for #109