===> Cleaning for felix-2.2.5