Removing dead fields; updating version