cleanup work - part3