Correct repos and cleanup

please pull after #2