Removed references to cmp that don't exist in code