Adds more cleanup.