Cleanup for #42