Clone new repositories + Minor clean up