Cleanup for #39
merge