panel: cleanup some of that crazy OPPO edits