===> Cleaning for felix-2.4.1