Do some cleanup for OC slave
Do some cleanup for OC slave