Clean up LWRP implementation