Added clear of fields