===> Cleaning for felix-2.6.0