Further Cleaning of Repo