===> Cleaning for felix-2.16.1