===> Cleaning for opa-1.0.0