Moved cleanKeys, but did not update all references to it