Deleted some redundancies