Last cleanup part1