Remove kludge.