Last cleanup part2