Merge "Remove obsolete files for optf/cmso"