Removed not yet used fields