cleanup and make rh/dae compliant