cleanup after rework