Cleanup and redistro + mah forky cloner