More cleanup :(