Merge "Remove unused property file"