Clean-up the O&M system