More cleanup :octocat: