Big cleanup part1