===> Cleaning for ap24-rpaf-0.8.4