Remove "cleverness"