Library Sample, first version, clean-up.

Change-Id: I794852dcc8de006a8b4737a0b1e42fd9ed2b44e1