More cleanup. Even more is possible, but kind of pointless.