adding RPCP and cleanup