Removed unused fields and types.