===> Cleaning for felix-0.5.1