Cleanup for #14