Last minute clean up