===> Cleaning for felix-2.8.1