2.0.64 and repo cleanup