Removing some more stuff