Adds more cleanup