Cleanup for #19