===> Cleaning for felix-2.11.0