===> Cleaning for felix-2.9.0