Cleanup for #16