Samples code clean-up.