Removed some redundant type information