cleanup work - part2