===> Cleaning for poke-3.3