===> Cleaning for felix-2.5.0