Remove too cleverness