Removing some more garbage