Cleanup and github support