More cleanup in orpl module