cleanup work, in progress