Cleanup for #64
merge