Updating samples. Removing types which are not necessary.