final cleanup and links to github commit