Repo cleanup & fix warning