Adds a little bit more cleanup.