chore(all): More cleanup