Removing a few more things we don't need