Changed `rcpl` to `withRCPL` and improved cleanup