Added isset path to remove entity subform in situations it should not exist.