Further repo cleanup