Add keep in samples
Cleanup samples