Removed unnecessary excludes