Some cleanning part2