README and sample cleanup