final clean ups