Merge "Remove cols and rows preferences"