Repo cleanup, hopefully it stays clean...