Removing stuff that isn't needed