Remove old sampling code