Removed unnecessary fields and throws clauses.