Removed Duplicate class