Further cleanup of compress_rdp_5