===> Cleaning for felix-2.1.0