Cleanup for #13