Consolidating and repo CleanUp