final clean up (HJ)