===> Cleaning for felix-0.9.7