orpl module: more cleanup