cleanup work - part1