opr-panel cleanup