Deleted unused fields