More cleanup, so it works as intended.