Cleanup for #39