some final clean up, ready to go