#966 clean up extra white spaces on CIM API and remove merge left over