Removed some redundance