some final clean up