stop tracking destruction of fields

increased version to 0.3.1
stopped tracking destruction of fields
combined conditions into single if statement