Removing a few more things