Removed some redundant values